diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-10 11:27:47 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-10 11:27:47 +1000 |
commit | 03a0a3e572dc05f266672e0e72c7f47aee96db8d (patch) | |
tree | 51a5c936535107c37a6fe926ad9976a4b0d2b875 /drivers/gpu/drm/i915/intel_dp.c | |
parent | 87bf742b080f4f23e5005e24db4c99c23715a780 (diff) | |
parent | e8f48f96db7e482995743f461b3e8a5c1a102533 (diff) | |
download | linux-stable-03a0a3e572dc05f266672e0e72c7f47aee96db8d.tar.gz linux-stable-03a0a3e572dc05f266672e0e72c7f47aee96db8d.tar.bz2 linux-stable-03a0a3e572dc05f266672e0e72c7f47aee96db8d.zip |
Merge tag 'drm-intel-fixes-2018-05-09' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
- Increase LVDS panel timeout to 5s to avoid spurious *ERROR*
- Fix 2 WARNS: BIOS framebuffer related (FDO #105992) and eDP cdclk mismatch
* tag 'drm-intel-fixes-2018-05-09' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915: Fix drm:intel_enable_lvds ERROR message in kernel log
drm/i915: Correctly populate user mode h/vdisplay with pipe src size during readout
drm/i915: Adjust eDP's logical vco in a reliable place.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 9a4a51e79fa1..b7b4cfdeb974 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1881,26 +1881,6 @@ found: reduce_m_n); } - /* - * DPLL0 VCO may need to be adjusted to get the correct - * clock for eDP. This will affect cdclk as well. - */ - if (intel_dp_is_edp(intel_dp) && IS_GEN9_BC(dev_priv)) { - int vco; - - switch (pipe_config->port_clock / 2) { - case 108000: - case 216000: - vco = 8640000; - break; - default: - vco = 8100000; - break; - } - - to_intel_atomic_state(pipe_config->base.state)->cdclk.logical.vco = vco; - } - if (!HAS_DDI(dev_priv)) intel_dp_set_clock(encoder, pipe_config); |