From 486c52afc905c157e1fab9e24db798224f6853c9 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Thu, 21 Feb 2013 13:35:49 -0500 Subject: [PATCH] drm/exynos: Remove crtc->disable Remove the crtc->disable callback since it's not needed and most likely incorrect anyways. DRM will fall back to dpms if disable is not defined, and that will simplify the various paths we have. Furthermore, all disable did was disable the default overlay on the crtc, which is not the intended result. BUG=None TEST=Tested on snow with boot/hotplug/suspend/idle Change-Id: I2b134662bfa56d35a0de9fbf761d7a8a3708009e Signed-off-by: Sean Paul Reviewed-on: https://gerrit.chromium.org/gerrit/43725 --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index db9167aca766..09d98ff8e55b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -299,16 +299,6 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) #endif } -static void exynos_drm_crtc_disable(struct drm_crtc *crtc) -{ - struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); - struct exynos_drm_overlay *overlay = &exynos_crtc->overlay; - int win = overlay->zpos; - - exynos_drm_fn_encoder(crtc, &win, - exynos_drm_encoder_crtc_disable); -} - static void exynos_drm_crtc_prepare(struct drm_crtc *crtc) { DRM_DEBUG_KMS("%s\n", __FILE__); @@ -420,7 +410,6 @@ static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc) static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { .dpms = exynos_drm_crtc_dpms, - .disable = exynos_drm_crtc_disable, .prepare = exynos_drm_crtc_prepare, .commit = exynos_drm_crtc_commit, .mode_fixup = exynos_drm_crtc_mode_fixup, -- 2.20.1