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

Commit 13520b05 authored by Kristian Høgsberg's avatar Kristian Høgsberg Committed by Eric Anholt
Browse files

drm/i915: Read the right SDVO register when detecting SVDO/HDMI. 



This fixes incorrect detection of the second SDVO/HDMI output on G4X, and
extra boot time on pre-G4X.

Signed-off-by: default avatarKristian Høgsberg <krh@redhat.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent d4906093

drivers/gpu/drm/i915/intel_display.c

+9 −1
Original line number Diff line number Diff line
@@ -1735,13 +1735,21 @@ static void intel_setup_outputs(struct drm_device *dev) 


	if (IS_I9XX(dev)) {

		int found;

		u32 reg;



		if (I915_READ(SDVOB) & SDVO_DETECTED) {

			found = intel_sdvo_init(dev, SDVOB);

			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))

				intel_hdmi_init(dev, SDVOB);

		}

		if (!IS_G4X(dev) || (I915_READ(SDVOB) & SDVO_DETECTED)) {



		/* Before G4X SDVOC doesn't have its own detect register */

		if (IS_G4X(dev))

			reg = SDVOC;

		else

			reg = SDVOB;



		if (I915_READ(reg) & SDVO_DETECTED) {

			found = intel_sdvo_init(dev, SDVOC);

			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))

				intel_hdmi_init(dev, SDVOC);