drm/i915/skl: Explicitly check for eDP in skl_ddi_pll_select()
authorLyude <cpaul@redhat.com>
Tue, 2 Feb 2016 14:35:09 +0000 (09:35 -0500)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 9 Feb 2016 09:34:48 +0000 (10:34 +0100)
Assuming any connector that isn't DP, MST, or HDMI is eDP definitely
seems likely to cover up other bugs in the future.

Signed-off-by: Lyude <cpaul@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1454423709-21882-2-git-send-email-cpaul@redhat.com
drivers/gpu/drm/i915/intel_ddi.c

index 32c8991669d11bb889d31ea7670e021147ff2972..cdf2e14aa45daf46f5215732e41ec5c205c4ab3a 100644 (file)
@@ -1546,8 +1546,10 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,
                }
 
                cfgcr1 = cfgcr2 = 0;
-       } else /* eDP */
+       } else if (intel_encoder->type == INTEL_OUTPUT_EDP) {
                return true;
+       } else
+               return false;
 
        memset(&crtc_state->dpll_hw_state, 0,
               sizeof(crtc_state->dpll_hw_state));