summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2014-06-13 15:25:32 +0900
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-06-16 02:45:17 -0700
commit836ceaabef6087cae8707bc415021496571d3bbf (patch)
treec8fe91c59bf85d2b8e56136cf42d2d1f4fe172d8
parent1770d2efa3197fcae93d787d8d912cece4aac250 (diff)
downloadlinux-3.10-836ceaabef6087cae8707bc415021496571d3bbf.tar.gz
linux-3.10-836ceaabef6087cae8707bc415021496571d3bbf.tar.bz2
linux-3.10-836ceaabef6087cae8707bc415021496571d3bbf.zip
Revert "drm/exynos: do hdmi power control by crtc DPMS"
This reverts commit 4d1a75bbabd92b458e8f8cf1d3c071efc873cc87. Change-Id: I4b56d6ac44586580c4a6d871e20064aacce30331
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c6
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c6
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.h1
3 files changed, 1 insertions, 12 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 539d6a7eb8f..337e4d69a38 100644
--- 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 d0627daed62..5c1ebbab007 100644
--- 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 c5db9f4cc71..3811e417f0e 100644
--- 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