diff options
| author | Mika Kahola | 2016-02-05 12:29:28 +0100 |
|---|---|---|
| committer | Jani Nikula | 2016-02-09 16:32:21 +0100 |
| commit | af3997b569dbd2ff50318c874fa4618d8b628fb0 (patch) | |
| tree | 9c554182cfb528529f8a93fc71d582031b197cad /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/skl: Explicitly check for eDP in skl_ddi_pll_select() (diff) | |
| download | kernel-qcow2-linux-af3997b569dbd2ff50318c874fa4618d8b628fb0.tar.gz kernel-qcow2-linux-af3997b569dbd2ff50318c874fa4618d8b628fb0.tar.xz kernel-qcow2-linux-af3997b569dbd2ff50318c874fa4618d8b628fb0.zip | |
drm/i915: Skip DDI PLL selection for DSI
Skip DDI PLL selection if display type is DSI/MIPI.
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1454671768-27062-1-git-send-email-mika.kahola@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5bc9a364b04a..76421c962216 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9848,8 +9848,13 @@ static void broadwell_modeset_commit_cdclk(struct drm_atomic_state *old_state) static int haswell_crtc_compute_clock(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state) { - if (!intel_ddi_pll_select(crtc, crtc_state)) - return -EINVAL; + struct intel_encoder *intel_encoder = + intel_ddi_get_crtc_new_encoder(crtc_state); + + if (intel_encoder->type != INTEL_OUTPUT_DSI) { + if (!intel_ddi_pll_select(crtc, crtc_state)) + return -EINVAL; + } crtc->lowfreq_avail = false; |