>From 46e5badf6cf9b07461fc72279fe4617b644f8589 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Sun, 17 Jan 2016 15:16:29 +0100 Subject: [PATCH] analogix_dp-rockchip: use .enable instead of preprare/commit in encoder_helper_funcs --- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 7cb3f6b..15619c5 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c @@ -108,7 +108,7 @@ static void rockchip_dp_drm_encoder_mode_set(struct drm_encoder *encoder, /* do nothing */ } -static void rockchip_dp_drm_encoder_prepare(struct drm_encoder *encoder) +static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder) { struct rockchip_dp_device *dp = to_dp(encoder); int ret; @@ -161,8 +161,7 @@ static void rockchip_dp_drm_encoder_nop(struct drm_encoder *encoder) static const struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = { .mode_fixup = rockchip_dp_drm_encoder_mode_fixup, .mode_set = rockchip_dp_drm_encoder_mode_set, - .prepare = rockchip_dp_drm_encoder_prepare, - .commit = rockchip_dp_drm_encoder_nop, + .enable = rockchip_dp_drm_encoder_enable, .disable = rockchip_dp_drm_encoder_nop, }; -- 2.6.4