summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVandita Kulkarni2019-03-25 12:26:41 +0100
committerJani Nikula2019-04-10 14:37:26 +0200
commitc5b81a325263a891d5811aabe938c87e03db4c37 (patch)
treec33235355fec3e3d2260706a33362eb1a30594c4
parentdrm/i915/guc: Replace preempt_client lookup with engine->preempt_context (diff)
downloadkernel-qcow2-linux-c5b81a325263a891d5811aabe938c87e03db4c37.tar.gz
kernel-qcow2-linux-c5b81a325263a891d5811aabe938c87e03db4c37.tar.xz
kernel-qcow2-linux-c5b81a325263a891d5811aabe938c87e03db4c37.zip
drm/i915/icl: Ungate ddi clocks before IO enable
IO enable sequencing needs ddi clocks enabled. These clocks will be gated at a later point in the enable sequence. v2: Fix the commit header (Uma) v3: Remove the redundant read (Ville) Fixes: 949fc52af19e ("drm/i915/icl: add pll mapping for DSI") Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/1553513202-13863-1-git-send-email-vandita.kulkarni@intel.com
-rw-r--r--drivers/gpu/drm/i915/icl_dsi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/icl_dsi.c
index 6fc48479c97b..be1cfbced8e9 100644
--- a/drivers/gpu/drm/i915/icl_dsi.c
+++ b/drivers/gpu/drm/i915/icl_dsi.c
@@ -602,6 +602,12 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,
val |= DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, port);
}
I915_WRITE(DPCLKA_CFGCR0_ICL, val);
+
+ for_each_dsi_port(port, intel_dsi->ports) {
+ val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port);
+ }
+ I915_WRITE(DPCLKA_CFGCR0_ICL, val);
+
POSTING_READ(DPCLKA_CFGCR0_ICL);
mutex_unlock(&dev_priv->dpll_lock);