| commit | 5a01d5b61399fb03ffd54edfb68dca411d89dcda | [log] [tgz] |
|---|---|---|
| author | Lyude <cpaul@redhat.com> | Tue Feb 02 09:35:09 2016 -0500 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Feb 09 10:34:48 2016 +0100 |
| tree | e9be2680203d208d3b686370f96b0b4ede1a84e6 | |
| parent | 78385cb398748debb7ea2e36d6d2001830c172bc [diff] |
drm/i915/skl: Explicitly check for eDP in skl_ddi_pll_select() 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
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 32c8991..cdf2e14 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1546,8 +1546,10 @@ } 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));