Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeafaaca authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

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 8ec22b21
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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Tested-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 199b2bc2

drivers/gpu/drm/i915/intel_hdmi.c

+2 −5
Original line number Diff line number Diff line
@@ -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;