From f15863b27752682bb700c21de5f83f613a0fb77e Mon Sep 17 00:00:00 2001

From: Vandita Kulkarni <vandita.kulkarni@intel.com>

Date: Tue, 9 Nov 2021 17:34:28 +0530

Subject: Revert "drm/i915/tgl/dsi: Gate the ddi clocks after pll mapping"

Git-commit: f15863b27752682bb700c21de5f83f613a0fb77e

Patch-mainline: v5.16-rc2

References: bsc#1152489

This reverts commit 991d9557b0c4 ("drm/i915/tgl/dsi: Gate the ddi clocks

after pll mapping"). The Bspec was updated recently with the pll ungate

sequence similar to that of icl dsi enable sequence. Hence reverting.

Bspec: 49187

Fixes: 991d9557b0c4 ("drm/i915/tgl/dsi: Gate the ddi clocks after pll mapping")

Cc: <stable@vger.kernel.org> # v5.4+

Signed-off-by: Vandita Kulkarni <vandita.kulkarni@intel.com>

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20211109120428.15211-1-vandita.kulkarni@intel.com

(cherry picked from commit 4579509ef181480f4e4510d436c691519167c5c2)

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/i915/display/icl_dsi.c |   10 ++--------

 1 file changed, 2 insertions(+), 8 deletions(-)

--- a/drivers/gpu/drm/i915/display/icl_dsi.c

+++ b/drivers/gpu/drm/i915/display/icl_dsi.c

@@ -646,10 +646,7 @@ static void gen11_dsi_map_pll(struct int

 	intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);

 	for_each_dsi_phy(phy, intel_dsi->phys) {

-		if (INTEL_GEN(dev_priv) >= 12)

-			val |= ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy);

-		else

-			val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy);

+		val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy);

 	}

 	intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);

@@ -1085,8 +1082,6 @@ static void

 gen11_dsi_enable_port_and_phy(struct intel_encoder *encoder,

 			      const struct intel_crtc_state *crtc_state)

 {

-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

-

 	/* step 4a: power up all lanes of the DDI used by DSI */

 	gen11_dsi_power_up_lanes(encoder);

@@ -1112,8 +1107,7 @@ gen11_dsi_enable_port_and_phy(struct int

 	gen11_dsi_configure_transcoder(encoder, crtc_state);

 	/* Step 4l: Gate DDI clocks */

-	if (IS_GEN(dev_priv, 11))

-		gen11_dsi_gate_clocks(encoder);

+	gen11_dsi_gate_clocks(encoder);

 }

 static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)