From: Ander Conselvan de Oliveira Date: Wed, 29 Oct 2014 09:32:38 +0000 (+0200) Subject: drm/i915: Don't store current shared DPLL in the new pipe_config X-Git-Tag: v3.19-rc1~73^2~64^2~76 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9f1af393477bd4a60e23531b579b325cf1918da;p=karo-tx-linux.git drm/i915: Don't store current shared DPLL in the new pipe_config Now that shared DPLLs configuration is staged, there's no need to track the current ones in the new pipe_config since those are released before making the new pipe_config effective. Signed-off-by: Ander Conselvan de Oliveira Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 200fcb163a2d..be596178dca4 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5533,14 +5533,6 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, if (HAS_IPS(dev)) hsw_compute_ips_config(crtc, pipe_config); - /* - * XXX: PCH/WRPLL clock sharing is done in ->mode_set if ->compute_clock is not - * set, so make sure the old clock survives for now. - */ - if (dev_priv->display.crtc_compute_clock == NULL && - (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev) || HAS_DDI(dev))) - pipe_config->shared_dpll = crtc->config.shared_dpll; - if (pipe_config->has_pch_encoder) return ironlake_fdi_compute_config(crtc, pipe_config);