From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 25 May 2012 09:23:37 +0000 (+0100)
Subject: drm/i915/hdmi: Fix reg values for g4x_hdmi_connected
X-Git-Tag: v3.6-rc1~83^2~47^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eeafaaca763408c099d2ade3a69e0716f296a97b;p=platform%2Fkernel%2Flinux-3.10.git

drm/i915/hdmi: Fix reg values for g4x_hdmi_connected

Paulo pointed out that gen4 re-used the SDVO registers for HDMI (the
separate HDMI registers where introduced with the first PCH) and so
g4x_hdmi_connected() never selected the right bit and always returned
disconnected.

Regression in

commit 8ec22b214d76773c9d89f4040505ce10f677ed9a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri May 11 18:01:34 2012 +0100

    drm/i915/hdmi: Query the live connector status bit for G4x

Cc: Paulo Zanoni <przanoni@gmail.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 77f0f8f..4c6f141 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -459,15 +459,12 @@ static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
 	uint32_t bit;
 
 	switch (intel_hdmi->sdvox_reg) {
-	case HDMIB:
+	case SDVOB:
 		bit = HDMIB_HOTPLUG_LIVE_STATUS;
 		break;
-	case HDMIC:
+	case SDVOC:
 		bit = HDMIC_HOTPLUG_LIVE_STATUS;
 		break;
-	case HDMID:
-		bit = HDMID_HOTPLUG_LIVE_STATUS;
-		break;
 	default:
 		bit = 0;
 		break;