Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/hdmi: Fix reg values for g4x_hdmi_connected

Browse Source 
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 8ec22b214d
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>
This commit is contained in:
Chris Wilson 2012-05-25 10:23:37 +01:00 committed by Daniel Vetter
parent 199b2bc25b
commit eeafaaca76
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -459,15 +459,12 @@ static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi)
uint32_t bit; uint32_t bit;
switch (intel_hdmi->sdvox_reg) { switch (intel_hdmi->sdvox_reg) {
case HDMIB: case SDVOB:
bit = HDMIB_HOTPLUG_LIVE_STATUS; bit = HDMIB_HOTPLUG_LIVE_STATUS;
break; break;
case HDMIC: case SDVOC:
bit = HDMIC_HOTPLUG_LIVE_STATUS; bit = HDMIC_HOTPLUG_LIVE_STATUS;
break; break;
case HDMID:
bit = HDMID_HOTPLUG_LIVE_STATUS;
break;
default: default:
bit = 0; bit = 0;
break; break;