drm/i915: don't use HPD_PORT_A as an alias for HPD_NONE

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 9410aaba01d46569dc7d6af38f915ab016ecd4e4..f08ec9cf46e65c81c2dc9b9306b7cdbf24c83d90 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1273,7 +1273,9 @@ static void intel_get_hpd_pins(u32 *pin_mask, u32 *long_mask,
 
                *pin_mask |= BIT(i);
 
-               port = intel_hpd_pin_to_port(i);
+               if (!intel_hpd_pin_to_port(i, &port))
+                       continue;
+
                if (long_pulse_detect(port, dig_hotplug_reg))
                        *long_mask |= BIT(i);
        }