Skip to content

Commit

Permalink
drm/i915/hdmi: Fix reg values for g4x_hdmi_connected
Browse files Browse the repository at this point in the history
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 8ec22b2
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>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed May 25, 2012
1 parent 199b2bc commit eeafaac
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/gpu/drm/i915/intel_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit eeafaac

Please sign in to comment.