drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect

[linux-2.6-block.git] / drivers / gpu / drm / i915 / intel_display.c

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d637e7b54326c75f43c0d0703e9027bc61219088..1bec8de9641225c0db13b63981b06f2e05c10ace 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5241,7 +5241,14 @@ intel_display_port_aux_power_domain(struct intel_encoder *intel_encoder)
 
        switch (intel_encoder->type) {
        case INTEL_OUTPUT_UNKNOWN:
-               /* Only DDI platforms should ever use this output type */
+       case INTEL_OUTPUT_HDMI:
+               /*
+                * Only DDI platforms should ever use these output types.
+                * We can get here after the HDMI detect code has already set
+                * the type of the shared encoder. Since we can't be sure
+                * what's the status of the given connectors, play safe and
+                * run the DP detection too.
+                */
                WARN_ON_ONCE(!HAS_DDI(dev));
        case INTEL_OUTPUT_DISPLAYPORT:
        case INTEL_OUTPUT_EDP: