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

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

drm/i915: Fix hotplug interrupt enabling for SDVOC 

A broken conditional would lead to SDVOC waiting upon hotplug events on
SDVOB - and so miss all activity on its SDVO port.

This regression has been introduced in

commit 1d843f9d
Author: Egbert Eich <eich@suse.de>
Date:   Mon Feb 25 12:06:49 2013 -0500

    DRM/I915: Add enum hpd_pin to intel_encoder.

References: https://bugs.freedesktop.org/show_bug.cgi?id=58405


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Add regression note.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 317ddd25

drivers/gpu/drm/i915/intel_sdvo.c

+4 −2
Original line number Diff line number Diff line
@@ -2793,8 +2793,10 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
	/* Only enable the hotplug irq if we need it, to work around noisy

	 * hotplug lines.

	 */

	if (intel_sdvo->hotplug_active)

		intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;

	if (intel_sdvo->hotplug_active) {

		intel_encoder->hpd_pin =

			intel_sdvo->is_sdvob ?  HPD_SDVO_B : HPD_SDVO_C;

	}



	intel_encoder->compute_config = intel_sdvo_compute_config;

	intel_encoder->disable = intel_disable_sdvo;