diff options
| author | Lyude <cpaul@redhat.com> | 2016-02-02 09:35:09 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-02-09 10:34:48 +0100 |
| commit | 5a01d5b61399fb03ffd54edfb68dca411d89dcda (patch) | |
| tree | e9be2680203d208d3b686370f96b0b4ede1a84e6 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | 78385cb398748debb7ea2e36d6d2001830c172bc (diff) | |
| download | op-kernel-dev-5a01d5b61399fb03ffd54edfb68dca411d89dcda.zip op-kernel-dev-5a01d5b61399fb03ffd54edfb68dca411d89dcda.tar.gz | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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)); |
