Revert "drm/exynos: do hdmi power control by crtc DPMS"

This reverts commit 4d1a75bbabd92b458e8f8cf1d3c071efc873cc87.

Change-Id: I4b56d6ac44586580c4a6d871e20064aacce30331

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 539d6a7..337e4d6 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1925,6 +1925,7 @@ static struct exynos_drm_display_ops hdmi_display_ops = {
        .create_connector = hdmi_create_connector,
        .mode_fixup     = hdmi_mode_fixup,
        .mode_set       = hdmi_mode_set,
+       .dpms           = hdmi_dpms,
        .commit         = hdmi_commit,
 };
 
@@ -1933,11 +1934,6 @@ static struct exynos_drm_display hdmi_display = {
        .ops = &hdmi_display_ops,
 };
 
-void hdmi_dpms_from_mixer(int mode)
-{
-       hdmi_dpms(&hdmi_display, mode);
-}
-
 static irqreturn_t hdmi_irq_thread(int irq, void *arg)
 {
        struct hdmi_context *hdata = arg;

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index d0627da..5c1ebba 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1107,12 +1107,6 @@ static void mixer_dpms(struct exynos_drm_manager *mgr, int mode)
                DRM_DEBUG_KMS("unknown dpms mode: %d\n", mode);
                break;
        }
-
-       /*
-        * The hdmi should turn off after mixer turns off by H/W limitation.
-        * Otherwise, the TV power domain is not disabled.
-        */
-       hdmi_dpms_from_mixer(mode);
 }
 
 /* Only valid for Mixer version 16.0.33.0 */

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.h b/drivers/gpu/drm/exynos/exynos_mixer.h
index c5db9f4..3811e41 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.h
+++ b/drivers/gpu/drm/exynos/exynos_mixer.h
@@ -16,6 +16,5 @@
 
 /* This function returns 0 if the given timing is valid for the mixer */
 int mixer_check_mode(struct drm_display_mode *mode);
-extern void hdmi_dpms_from_mixer(int mode);
 
 #endif