Skip to contentSkip to conversation

drm/i915/display: Do both crawl and squash when changing cdclk

PATCH In review Anusha Srivatsa 4 participants 10 messages Nov 4, 2022 – Nov 9, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/display: Do both crawl and squash when changing cdclk

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config. Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and
cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

v6: MTl should not follow PUnit mailbox communication as the rest of gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161 +++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +133 -28
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void dg2_cdclk_squash_program(struct drm_i915_private *i915,
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);
 }
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform)
+{
+	return hweight16(waveform ?: 0xffff);
+}
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private *i915,
+				   const struct intel_cdclk_config *old_cdclk_config,
+				   const struct intel_cdclk_config *new_cdclk_config,
+				   struct intel_cdclk_config *mid_cdclk_config)
+{
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, old_cdclk_config->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, new_cdclk_config->cdclk);
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0 ||
+	    old_cdclk_config->vco == new_cdclk_config->vco ||
+	    old_waveform == new_waveform)
+		return false;
+
+	*mid_cdclk_config = *new_cdclk_config;
+
+	/* Populate the mid_cdclk_config accordingly.
+	 * - If moving to a higher cdclk, the desired action is squashing.
+	 * The mid cdclk config should have the new (squash) waveform.
+	 * - If moving to a lower cdclk, the desired action is crawling.
+	 * The mid cdclk config should have the new vco.
+	 */
+
+	if (cdclk_squash_divider(new_waveform) > cdclk_squash_divider(old_waveform)) {
+		mid_cdclk_config->vco = old_cdclk_config->vco;
+		mid_waveform = new_waveform;
+	} else {
+		mid_cdclk_config->vco = new_cdclk_config->vco;
+		mid_waveform = old_waveform;
+	}
+
+	mid_cdclk_config->cdclk = DIV_ROUND_CLOSEST(cdclk_squash_divider(mid_waveform) *
+						    mid_cdclk_config->vco, size * div);
+
+	/* make sure the mid clock came out sane */
+
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk <
+		    min(old_cdclk_config->cdclk, new_cdclk_config->cdclk));
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk >
+		    i915->display.cdclk.max_cdclk_freq);
+	drm_WARN_ON(&i915->drm, cdclk_squash_waveform(i915, mid_cdclk_config->cdclk) !=
+		    mid_waveform);
+
+	return true;
+}
+
+static void _bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			   const struct intel_cdclk_config *cdclk_config,
+			   enum pipe pipe)
 {
 	int cdclk = cdclk_config->cdclk;
 	int vco = cdclk_config->vco;
 	u32 val;
 	u16 waveform;
 	int clock;
-	int ret;
-
-	/* Inform power controller of upcoming frequency change. */
-	if (DISPLAY_VER(dev_priv) >= 11)
-		ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
-					SKL_CDCLK_PREPARE_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE, 3);
-	else
-		/*
-		 * BSpec requires us to wait up to 150usec, but that leads to
-		 * timeouts; the 2ms used here is based on experiment.
-		 */
-		ret = snb_pcode_write_timeout(&dev_priv->uncore,
-					      HSW_PCODE_DE_WRITE_FREQ_REQ,
-					      0x80000000, 150, 2);
-	if (ret) {
-		drm_err(&dev_priv->drm,
-			"Failed to inform PCU about cdclk change (err %d, freq %d)\n",
-			ret, cdclk);
-		return;
-	}
 
 	if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco > 0 && vco > 0) {
 		if (dev_priv->display.cdclk.hw.vco != vco)
@@ -1781,6 +1818,49 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
 
 	if (pipe != INVALID_PIPE)
 		intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv, pipe));
+}
+
+static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			  const struct intel_cdclk_config *cdclk_config,
+			  enum pipe pipe)
+{
+	struct intel_cdclk_config mid_cdclk_config;
+	int cdclk = cdclk_config->cdclk;
+	int ret;
+
+	/* Inform power controller of upcoming frequency change.
+	 * MTL does not follow the PUnit mailbox communication, skip
+	 * this for MTL. 
+	 */
+	if (!IS_METEORLAKE(dev_priv)) {
+		if (DISPLAY_VER(dev_priv) >= 11)
+			ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
+						SKL_CDCLK_PREPARE_FOR_CHANGE,
+						SKL_CDCLK_READY_FOR_CHANGE,
+						SKL_CDCLK_READY_FOR_CHANGE, 3);
+		else
+			/*
+			 * BSpec requires us to wait up to 150usec, but that leads to
+			 * timeouts; the 2ms used here is based on experiment.
+			 */
+			ret = snb_pcode_write_timeout(&dev_priv->uncore,
+						      HSW_PCODE_DE_WRITE_FREQ_REQ,
+						      0x80000000, 150, 2);
+		if (ret) {
+			drm_err(&dev_priv->drm,
+				"Failed to inform PCU about cdclk change (err %d, freq %d)\n",
+				ret, cdclk);
+			return;
+		}
+	}
+
+	if (cdclk_crawl_and_squash(dev_priv, &dev_priv->display.cdclk.hw,
+				   cdclk_config, &mid_cdclk_config)) {
+		_bxt_set_cdclk(dev_priv, &mid_cdclk_config, pipe);
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	} else {
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	}
 
 	if (DISPLAY_VER(dev_priv) >= 11) {
 		ret = snb_pcode_write(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
@@ -1953,6 +2033,26 @@ void intel_cdclk_uninit_hw(struct drm_i915_private *i915)
 		skl_cdclk_uninit_hw(i915);
 }
 
+static bool intel_cdclk_can_crawl_and_squash(struct drm_i915_private *i915,
+					     const struct intel_cdclk_config *a,
+					     const struct intel_cdclk_config *b)
+{
+	u16 old_waveform;
+	u16 new_waveform;
+
+	if (a->vco == 0 || b->vco == 0)
+		return false;
+
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, a->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, b->cdclk);
+
+	return a->vco != b->vco &&
+	       old_waveform != new_waveform;
+}
+
 static bool intel_cdclk_can_crawl(struct drm_i915_private *dev_priv,
 				  const struct intel_cdclk_config *a,
 				  const struct intel_cdclk_config *b)
@@ -2759,9 +2859,14 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
 			pipe = INVALID_PIPE;
 	}
 
-	if (intel_cdclk_can_squash(dev_priv,
-				   &old_cdclk_state->actual,
-				   &new_cdclk_state->actual)) {
+	if (intel_cdclk_can_crawl_and_squash(dev_priv,
+					     &old_cdclk_state->actual,
+					     &new_cdclk_state->actual)) {
+		drm_dbg_kms(&dev_priv->drm,
+			    "Can change cdclk via crawling and squashing\n");
+	} else if (intel_cdclk_can_squash(dev_priv,
+					&old_cdclk_state->actual,
+					&new_cdclk_state->actual)) {
 		drm_dbg_kms(&dev_priv->drm,
 			    "Can change cdclk via squashing\n");
 	} else if (intel_cdclk_can_crawl(dev_priv,
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 drm/i915/display: Add CDCLK Support for MTL

As per bSpec MTL has 38.4 MHz Reference clock. Adding the cdclk tables and cdclk_funcs that MTL will use.

v2: Revert to using bxt_get_cdclk()

BSpec: 65243

---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +21 -1
index d1e0763513be..e7374fd92da9 100644
@@ -1345,6 +1345,16 @@ static const struct intel_cdclk_vals dg2_cdclk_table[] = {
 	{}
 };
 
+static const struct intel_cdclk_vals mtl_cdclk_table[] = {
+	{ .refclk = 38400, .cdclk = 172800, .divider = 2, .ratio = 16, .waveform = 0xad5a },
+	{ .refclk = 38400, .cdclk = 192000, .divider = 2, .ratio = 16, .waveform = 0xb6b6 },
+	{ .refclk = 38400, .cdclk = 307200, .divider = 2, .ratio = 16, .waveform = 0x0000 },
+	{ .refclk = 38400, .cdclk = 480000, .divider = 2, .ratio = 25, .waveform = 0x0000 },
+	{ .refclk = 38400, .cdclk = 556800, .divider = 2, .ratio = 29, .waveform = 0x0000 },
+	{ .refclk = 38400, .cdclk = 652800, .divider = 2, .ratio = 34, .waveform = 0x0000 },
+	{}
+};
+
 static int bxt_calc_cdclk(struct drm_i915_private *dev_priv, int min_cdclk)
 {
 	const struct intel_cdclk_vals *table = dev_priv->display.cdclk.table;
@@ -3164,6 +3174,13 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)
 	return freq;
 }
 
+static const struct intel_cdclk_funcs mtl_cdclk_funcs = {
+	.get_cdclk = bxt_get_cdclk,
+	.set_cdclk = bxt_set_cdclk,
+	.modeset_calc_cdclk = bxt_modeset_calc_cdclk,
+	.calc_voltage_level = tgl_calc_voltage_level,
+};
+
 static const struct intel_cdclk_funcs tgl_cdclk_funcs = {
 	.get_cdclk = bxt_get_cdclk,
 	.set_cdclk = bxt_set_cdclk,
@@ -3299,7 +3316,10 @@ static const struct intel_cdclk_funcs i830_cdclk_funcs = {
  */
 void intel_init_cdclk_hooks(struct drm_i915_private *dev_priv)
 {
-	if (IS_DG2(dev_priv)) {
+	if (IS_METEORLAKE(dev_priv)) {
+		dev_priv->display.funcs.cdclk = &mtl_cdclk_funcs;
+		dev_priv->display.cdclk.table = mtl_cdclk_table;
+	} else if (IS_DG2(dev_priv)) {
 		dev_priv->display.funcs.cdclk = &tgl_cdclk_funcs;
 		dev_priv->display.cdclk.table = dg2_cdclk_table;
 	} else if (IS_ALDERLAKE_P(dev_priv)) {
Signature · 1 line
2.25.1
#2 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk
URL : https://patchwork.freedesktop.org/series/110554/
State : warning

== Summary ==

Error: dim checkpatch failed
a2db805524d6 drm/i915/display: Do both crawl and squash when changing cdclk -:161: ERROR:TRAILING_WHITESPACE: trailing whitespace
#161: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:1833:
+^I * this for MTL. $

total: 1 errors, 0 warnings, 0 checks, 191 lines checked 8fe91359a4db drm/i915/display: Add CDCLK Support for MTL

#3 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk
URL : https://patchwork.freedesktop.org/series/110554/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_12346 -> Patchwork_110554v1
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/index.html

Participating hosts (39 -> 28)
------------------------------

Additional (2): fi-rkl-11600 fi-tgl-dsi
Missing (13): fi-bdw-samus bat-dg2-8 bat-dg2-9 bat-adlp-6 bat-adlp-4 fi-ctg-p8600 fi-hsw-4770 bat-adln-1 bat-rplp-1 bat-rpls-1 bat-rpls-2 bat-dg2-11 bat-jsl-1

Known issues
------------

Here are the changes found in Patchwork_110554v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [PASS][1] -> [FAIL][2] ([i915#7229])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/fi-pnv-d510/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-pnv-d510/igt@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-rkl-11600: NOTRUN -> [SKIP][3] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-engines:
- fi-rkl-11600: NOTRUN -> [SKIP][4] ([i915#4613]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][5] ([i915#3282])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@gem_tiled_pread_basic.html

* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][6] ([i915#3012])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- fi-apl-guc: [PASS][7] -> [DMESG-FAIL][8] ([i915#5334])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-apl-guc/igt@i915_selftest@live@gt_heartbeat.html

* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][9] ([i915#4817])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-rkl-11600: NOTRUN -> [SKIP][10] ([fdo#111827]) +7 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][11] ([i915#4103])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][12] ([fdo#109285] / [i915#4098])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@kms_psr@sprite_plane_onoff:
- fi-rkl-11600: NOTRUN -> [SKIP][13] ([i915#1072]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@kms_psr@sprite_plane_onoff.html

* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][14] ([i915#3555] / [i915#4098])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][15] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

* igt@prime_vgem@basic-userptr:
- fi-rkl-11600: NOTRUN -> [SKIP][16] ([fdo#109295] / [i915#3301] / [i915#3708])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-rkl-11600/igt@[email protected]

#### Possible fixes ####

* igt@i915_selftest@live@hangcheck:
- {fi-ehl-2}: [INCOMPLETE][17] -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/fi-ehl-2/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/fi-ehl-2/igt@i915_selftest@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456

Build changes
-------------

* Linux: CI_DRM_12346 -> Patchwork_110554v1

CI-20190529: 20190529
CI_DRM_12346: 7b32ba9462baa932abf6cbe2f1a8ecb79e922a6e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7044: dbeb6f92720292f8303182a0e649284cea5b11a6 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110554v1: 7b32ba9462baa932abf6cbe2f1a8ecb79e922a6e @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

618df5e98692 drm/i915/display: Add CDCLK Support for MTL 5c276cb6b86a drm/i915/display: Do both crawl and squash when changing cdclk

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/index.html

#4 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk

In reply to Anusha Srivatsa
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/display: Do both crawl and squash when changing cdclk
URL : https://patchwork.freedesktop.org/series/110554/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_12346_full -> Patchwork_110554v1_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_110554v1_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_110554v1_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Participating hosts (10 -> 9)
------------------------------

Missing (1): shard-dg1

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_110554v1_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_plane_scaling@plane-upscale-with-modifiers-20x20@pipe-a-dp-1:
- shard-apl: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl7/igt@kms_plane_scaling@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl2/igt@kms_plane_scaling@[email protected]

Known issues
------------

Here are the changes found in Patchwork_110554v1_full that come from known issues:

### CI changes ###

#### Issues hit ####

* boot:
- shard-skl: ([PASS][3], [PASS][4], [PASS][5], [PASS][6], [PASS][7], [PASS][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [PASS][13], [PASS][14], [PASS][15], [PASS][16], [PASS][17], [PASS][18]) -> ([PASS][19], [PASS][20], [PASS][21], [FAIL][22], [PASS][23], [PASS][24], [PASS][25], [PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32]) ([i915#5032])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl4/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl10/boot.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl9/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl9/boot.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl9/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl9/boot.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl7/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl7/boot.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl7/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl6/boot.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl6/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl4/boot.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl4/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl3/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl3/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl10/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl3/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl3/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl4/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl4/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl6/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl6/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl6/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/boot.html

#### Possible fixes ####

* boot:
- shard-glk: ([PASS][33], [PASS][34], [FAIL][35], [PASS][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [PASS][48], [PASS][49], [PASS][50], [PASS][51], [PASS][52], [PASS][53], [PASS][54], [PASS][55], [PASS][56], [PASS][57]) ([i915#4392]) -> ([PASS][58], [PASS][59], [PASS][60], [PASS][61], [PASS][62], [PASS][63], [PASS][64], [PASS][65], [PASS][66], [PASS][67], [PASS][68], [PASS][69], [PASS][70], [PASS][71], [PASS][72], [PASS][73], [PASS][74], [PASS][75], [PASS][76], [PASS][77], [PASS][78], [PASS][79], [PASS][80], [PASS][81], [PASS][82])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk9/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk9/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk9/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk9/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk1/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk1/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk1/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk2/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk2/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk2/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk3/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk3/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk3/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk5/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk5/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk5/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk6/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk6/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk7/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk7/boot.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk7/boot.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/boot.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/boot.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/boot.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/boot.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk1/boot.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk1/boot.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk1/boot.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk1/boot.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/boot.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/boot.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/boot.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk3/boot.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk3/boot.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk3/boot.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk5/boot.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk5/boot.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk5/boot.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk6/boot.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk6/boot.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk6/boot.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk7/boot.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk7/boot.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk7/boot.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk8/boot.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk8/boot.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk8/boot.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk9/boot.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk9/boot.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk9/boot.html

### IGT changes ###

#### Issues hit ####

* igt@gem_create@create-massive:
- shard-skl: NOTRUN -> [DMESG-WARN][83] ([i915#4991])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@[email protected]

* igt@gem_ctx_persistence@hang:
- shard-skl: NOTRUN -> [SKIP][84] ([fdo#109271]) +202 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl3/igt@[email protected]

* igt@gem_exec_balancer@parallel-keep-submit-fence:
- shard-iclb: [PASS][85] -> [SKIP][86] ([i915#4525])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb2/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb7/igt@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-skl: NOTRUN -> [FAIL][87] ([i915#2846])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@[email protected]

* igt@gem_exec_fair@basic-none@rcs0:
- shard-glk: NOTRUN -> [FAIL][88] ([i915#2842])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@gem_exec_fair@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][89] -> [SKIP][90] ([i915#2190])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-tglb8/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-tglb7/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- shard-glk: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#4613])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@[email protected]

* igt@gem_lmem_swapping@heavy-verify-multi:
- shard-skl: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#4613]) +5 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-apl: [PASS][93] -> [DMESG-WARN][94] ([i915#5566] / [i915#716])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl6/igt@[email protected]

* igt@i915_pm_dc@dc6-dpms:
- shard-skl: NOTRUN -> [FAIL][95] ([i915#3989] / [i915#454])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/igt@[email protected]

* igt@i915_selftest@live@gt_heartbeat:
- shard-skl: [PASS][96] -> [DMESG-FAIL][97] ([i915#5334])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl3/igt@i915_selftest@live@gt_heartbeat.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@i915_selftest@live@gt_heartbeat.html

* igt@kms_async_flips@alternate-sync-async-flip@pipe-c-edp-1:
- shard-skl: NOTRUN -> [FAIL][98] ([i915#2521])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@kms_async_flips@[email protected]

* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][99] ([fdo#109271] / [i915#3886]) +13 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl3/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][100] ([fdo#109271] / [i915#3886]) +1 similar issue
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@kms_ccs@pipe-a-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html

* igt@kms_chamelium@dp-edid-change-during-suspend:
- shard-glk: NOTRUN -> [SKIP][101] ([fdo#109271] / [fdo#111827]) +2 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@[email protected]

* igt@kms_chamelium@dp-hpd-after-suspend:
- shard-apl: NOTRUN -> [SKIP][102] ([fdo#109271] / [fdo#111827])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl2/igt@[email protected]

* igt@kms_chamelium@hdmi-crc-fast:
- shard-skl: NOTRUN -> [SKIP][103] ([fdo#109271] / [fdo#111827]) +11 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/igt@[email protected]

* igt@kms_color_chamelium@ctm-negative:
- shard-snb: NOTRUN -> [SKIP][104] ([fdo#109271] / [fdo#111827]) +1 similar issue
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-snb4/igt@[email protected]

* igt@kms_cursor_crc@cursor-suspend@pipe-b-dp-1:
- shard-apl: [PASS][105] -> [DMESG-WARN][106] ([i915#180]) +1 similar issue
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl2/igt@kms_cursor_crc@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl3/igt@kms_cursor_crc@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip@atomic-transitions-varying-size:
- shard-skl: NOTRUN -> [INCOMPLETE][107] ([i915#7096])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/igt@kms_cursor_legacy@[email protected]

* igt@kms_dsc@dsc-with-bpc-formats:
- shard-glk: NOTRUN -> [SKIP][108] ([fdo#109271] / [i915#7205])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@b-edp1:
- shard-skl: [PASS][109] -> [FAIL][110] ([i915#2122])
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl4/igt@kms_flip@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-downscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][111] ([i915#2587] / [i915#2672]) +5 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb7/igt@kms_flip_scaled_crc@flip-32bpp-yftile-to-64bpp-yftile-downscaling@pipe-a-valid-mode.html

* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][112] ([i915#2672]) +4 similar issues
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-16bpp-4tile-upscaling@pipe-a-default-mode.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt:
- shard-glk: NOTRUN -> [SKIP][113] ([fdo#109271]) +34 similar issues
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-blt.html

* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-cpu:
- shard-snb: NOTRUN -> [SKIP][114] ([fdo#109271]) +17 similar issues
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-snb4/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-cpu.html

* igt@kms_plane_scaling@invalid-num-scalers@pipe-a-edp-1-invalid-num-scalers:
- shard-skl: NOTRUN -> [SKIP][115] ([fdo#109271] / [i915#5776]) +2 similar issues
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@kms_plane_scaling@[email protected]

* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-skl: NOTRUN -> [SKIP][116] ([fdo#109271] / [i915#658]) +3 similar issues
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl3/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-glk: NOTRUN -> [SKIP][117] ([fdo#109271] / [i915#658]) +1 similar issue
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@[email protected]

* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][118] -> [SKIP][119] ([fdo#109441]) +3 similar issues
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb1/igt@kms_psr@psr2_no_drrs.html

* igt@kms_vblank@pipe-d-ts-continuation-dpms-rpm:
- shard-apl: NOTRUN -> [SKIP][120] ([fdo#109271]) +20 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl2/igt@[email protected]

* igt@kms_writeback@writeback-fb-id:
- shard-skl: NOTRUN -> [SKIP][121] ([fdo#109271] / [i915#2437])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl7/igt@[email protected]

* igt@sysfs_clients@create:
- shard-glk: NOTRUN -> [SKIP][122] ([fdo#109271] / [i915#2994]) +1 similar issue
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@[email protected]

* igt@sysfs_clients@split-25:
- shard-skl: NOTRUN -> [SKIP][123] ([fdo#109271] / [i915#2994]) +2 similar issues
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl9/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_fair@basic-deadline:
- shard-glk: [FAIL][124] ([i915#2846]) -> [PASS][125]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk9/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk1/igt@[email protected]

* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [FAIL][126] ([i915#2842]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-tglb2/igt@gem_exec_fair@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-tglb8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][128] ([i915#2842]) -> [PASS][129] +1 similar issue
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/igt@gem_exec_fair@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk2/igt@gem_exec_fair@[email protected]

* igt@i915_module_load@reload-no-display:
- shard-snb: [DMESG-WARN][130] ([i915#4528]) -> [PASS][131]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-snb4/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-snb4/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- shard-tglb: [DMESG-WARN][132] ([i915#5591]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-tglb1/igt@i915_selftest@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-tglb8/igt@i915_selftest@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [FAIL][134] ([i915#2346]) -> [PASS][135]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk5/igt@kms_cursor_legacy@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk9/igt@kms_cursor_legacy@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-iclb: [FAIL][136] ([i915#79]) -> [PASS][137]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb7/igt@kms_flip@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb5/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: [FAIL][138] ([i915#2122]) -> [PASS][139]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-skl4/igt@kms_flip@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-skl10/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1:
- shard-glk: [FAIL][140] ([i915#2122]) -> [PASS][141]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk1/igt@kms_flip@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk3/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [DMESG-WARN][142] ([i915#180]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl3/igt@kms_flip@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl2/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling@pipe-a-default-mode:
- shard-iclb: [SKIP][144] ([i915#3555]) -> [PASS][145]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling@pipe-a-default-mode.html
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling@pipe-a-default-mode.html

* igt@kms_plane_multiple@tiling-none@pipe-a-edp-1:
- shard-iclb: [DMESG-WARN][146] ([i915#4391]) -> [PASS][147]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb7/igt@kms_plane_multiple@[email protected]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb5/igt@kms_plane_multiple@[email protected]

* igt@kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5@pipe-b-edp-1:
- shard-iclb: [SKIP][148] ([i915#5235]) -> [PASS][149] +2 similar issues
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb2/igt@kms_plane_scaling@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb6/igt@kms_plane_scaling@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][150] ([fdo#109441]) -> [PASS][151] +3 similar issues
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

#### Warnings ####

* igt@gem_pread@exhaustion:
- shard-glk: [INCOMPLETE][152] ([i915#7248]) -> [WARN][153] ([i915#2658])
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-glk8/igt@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-glk7/igt@[email protected]

* igt@gem_pwrite@basic-exhaustion:
- shard-apl: [INCOMPLETE][154] ([i915#7248]) -> [WARN][155] ([i915#2658])
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl3/igt@[email protected]
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl8/igt@[email protected]
- shard-tglb: [INCOMPLETE][156] ([i915#7248]) -> [WARN][157] ([i915#2658])
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-tglb7/igt@[email protected]
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-tglb7/igt@[email protected]

* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-fully-sf:
- shard-iclb: [SKIP][158] ([i915#658]) -> [SKIP][159] ([i915#2920])
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb3/igt@[email protected]
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb2/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-iclb: [SKIP][160] ([fdo#111068] / [i915#658]) -> [SKIP][161] ([i915#2920])
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb1/igt@[email protected]
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb2/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-iclb: [SKIP][162] ([i915#2920]) -> [SKIP][163] ([fdo#111068] / [i915#658])
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-iclb2/igt@[email protected]
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-iclb6/igt@[email protected]

* igt@runner@aborted:
- shard-apl: ([FAIL][164], [FAIL][165], [FAIL][166], [FAIL][167]) ([i915#180] / [i915#3002] / [i915#4312]) -> ([FAIL][168], [FAIL][169], [FAIL][170], [FAIL][171], [FAIL][172]) ([fdo#109271] / [i915#3002] / [i915#4312])
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl8/igt@[email protected]
[165]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl7/igt@[email protected]
[166]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl3/igt@[email protected]
[167]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12346/shard-apl2/igt@[email protected]
[168]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl6/igt@[email protected]
[169]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl3/igt@[email protected]
[170]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl1/igt@[email protected]
[171]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl6/igt@[email protected]
[172]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/shard-apl3/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4392]: https://gitlab.freedesktop.org/drm/intel/issues/4392
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4991]: https://gitlab.freedesktop.org/drm/intel/issues/4991
[i915#5032]: https://gitlab.freedesktop.org/drm/intel/issues/5032
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#5776]: https://gitlab.freedesktop.org/drm/intel/issues/5776
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#7096]: https://gitlab.freedesktop.org/drm/intel/issues/7096
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#7205]: https://gitlab.freedesktop.org/drm/intel/issues/7205
[i915#7248]: https://gitlab.freedesktop.org/drm/intel/issues/7248
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79

Build changes
-------------

* Linux: CI_DRM_12346 -> Patchwork_110554v1

CI-20190529: 20190529
CI_DRM_12346: 7b32ba9462baa932abf6cbe2f1a8ecb79e922a6e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7044: dbeb6f92720292f8303182a0e649284cea5b11a6 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_110554v1: 7b32ba9462baa932abf6cbe2f1a8ecb79e922a6e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_110554v1/index.html

#5 lore raw
In reply to Anusha Srivatsa
Quoted 43 lines · Anusha Srivatsa

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config. Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and
cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

v6: MTl should not follow PUnit mailbox communication as the rest of gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161 +++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void dg2_cdclk_squash_program(struct drm_i915_private *i915,
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);
 }

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1724

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +6 -3
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform)
+{
+	return hweight16(waveform ?: 0xffff);
+}
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private *i915,

Bikeshed: maybe name this "cdclk_compute_crawl_squash_midpoint" to help clarify that we're just computing stuff here and not actually programming the hardware in this function?

That naming would also help clarify why we're returning false if we crawl but don't squash or vice versa (i.e., there's no midpoint in those cases).

Quoted 7 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7 -0
+				   const struct intel_cdclk_config *old_cdclk_config,
+				   const struct intel_cdclk_config *new_cdclk_config,
+				   struct intel_cdclk_config *mid_cdclk_config)
+{
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1741

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, old_cdclk_config->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, new_cdclk_config->cdclk);
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0 ||

Isn't vco unsigned? "== 0" should be fine here I think.

Quoted 79 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +44 -22
+	    old_cdclk_config->vco == new_cdclk_config->vco ||
+	    old_waveform == new_waveform)
+		return false;
+
+	*mid_cdclk_config = *new_cdclk_config;
+
+	/* Populate the mid_cdclk_config accordingly.
+	 * - If moving to a higher cdclk, the desired action is squashing.
+	 * The mid cdclk config should have the new (squash) waveform.
+	 * - If moving to a lower cdclk, the desired action is crawling.
+	 * The mid cdclk config should have the new vco.
+	 */
+
+	if (cdclk_squash_divider(new_waveform) > cdclk_squash_divider(old_waveform)) {
+		mid_cdclk_config->vco = old_cdclk_config->vco;
+		mid_waveform = new_waveform;
+	} else {
+		mid_cdclk_config->vco = new_cdclk_config->vco;
+		mid_waveform = old_waveform;
+	}
+
+	mid_cdclk_config->cdclk = DIV_ROUND_CLOSEST(cdclk_squash_divider(mid_waveform) *
+						    mid_cdclk_config->vco, size * div);
+
+	/* make sure the mid clock came out sane */
+
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk <
+		    min(old_cdclk_config->cdclk, new_cdclk_config->cdclk));
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk >
+		    i915->display.cdclk.max_cdclk_freq);
+	drm_WARN_ON(&i915->drm, cdclk_squash_waveform(i915, mid_cdclk_config->cdclk) !=
+		    mid_waveform);
+
+	return true;
+}
+
+static void _bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			   const struct intel_cdclk_config *cdclk_config,
+			   enum pipe pipe)
 {
 	int cdclk = cdclk_config->cdclk;
 	int vco = cdclk_config->vco;
 	u32 val;
 	u16 waveform;
 	int clock;
-	int ret;
-
-	/* Inform power controller of upcoming frequency change. */
-	if (DISPLAY_VER(dev_priv) >= 11)
-		ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
-					SKL_CDCLK_PREPARE_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE, 3);
-	else
-		/*
-		 * BSpec requires us to wait up to 150usec, but that leads to
-		 * timeouts; the 2ms used here is based on experiment.
-		 */
-		ret = snb_pcode_write_timeout(&dev_priv->uncore,
-					      HSW_PCODE_DE_WRITE_FREQ_REQ,
-					      0x80000000, 150, 2);
-	if (ret) {
-		drm_err(&dev_priv->drm,
-			"Failed to inform PCU about cdclk change (err %d, freq %d)\n",
-			ret, cdclk);
-		return;
-	}
 
 	if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco > 0 && vco > 0) {
 		if (dev_priv->display.cdclk.hw.vco != vco)
@@ -1781,6 +1818,49 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
 
 	if (pipe != INVALID_PIPE)
 		intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv, pipe));
+}
+
+static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			  const struct intel_cdclk_config *cdclk_config,
+			  enum pipe pipe)

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · line 1835

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+{
+	struct intel_cdclk_config mid_cdclk_config;
+	int cdclk = cdclk_config->cdclk;
+	int ret;
+
+	/* Inform power controller of upcoming frequency change.
+	 * MTL does not follow the PUnit mailbox communication, skip
+	 * this for MTL. 
+	 */
+	if (!IS_METEORLAKE(dev_priv)) {

Is there a reason to believe that we'll go back to using pcode again on future platforms? If not, then it would be preferable to use a version check here like

        if (DISPLAY_VER(dev_priv) >= 14)

since we usually assume future platforms will follow the newest platform's behavior.

It also might be best to flatten this out rather than using nested if's.

        int ret = 0;

        if (display >= 14) {
                /* noop; Pcode not used for this */
        } else if (display >= 11) {
                pcode_request...
        } else {
                pcode_write_timeout...
        }

Matt

Quoted 79 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +56 -3
+		if (DISPLAY_VER(dev_priv) >= 11)
+			ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
+						SKL_CDCLK_PREPARE_FOR_CHANGE,
+						SKL_CDCLK_READY_FOR_CHANGE,
+						SKL_CDCLK_READY_FOR_CHANGE, 3);
+		else
+			/*
+			 * BSpec requires us to wait up to 150usec, but that leads to
+			 * timeouts; the 2ms used here is based on experiment.
+			 */
+			ret = snb_pcode_write_timeout(&dev_priv->uncore,
+						      HSW_PCODE_DE_WRITE_FREQ_REQ,
+						      0x80000000, 150, 2);
+		if (ret) {
+			drm_err(&dev_priv->drm,
+				"Failed to inform PCU about cdclk change (err %d, freq %d)\n",
+				ret, cdclk);
+			return;
+		}
+	}
+
+	if (cdclk_crawl_and_squash(dev_priv, &dev_priv->display.cdclk.hw,
+				   cdclk_config, &mid_cdclk_config)) {
+		_bxt_set_cdclk(dev_priv, &mid_cdclk_config, pipe);
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	} else {
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	}
 
 	if (DISPLAY_VER(dev_priv) >= 11) {
 		ret = snb_pcode_write(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL,
@@ -1953,6 +2033,26 @@ void intel_cdclk_uninit_hw(struct drm_i915_private *i915)
 		skl_cdclk_uninit_hw(i915);
 }
 
+static bool intel_cdclk_can_crawl_and_squash(struct drm_i915_private *i915,
+					     const struct intel_cdclk_config *a,
+					     const struct intel_cdclk_config *b)
+{
+	u16 old_waveform;
+	u16 new_waveform;
+
+	if (a->vco == 0 || b->vco == 0)
+		return false;
+
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, a->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, b->cdclk);
+
+	return a->vco != b->vco &&
+	       old_waveform != new_waveform;
+}
+
 static bool intel_cdclk_can_crawl(struct drm_i915_private *dev_priv,
 				  const struct intel_cdclk_config *a,
 				  const struct intel_cdclk_config *b)
@@ -2759,9 +2859,14 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state)
 			pipe = INVALID_PIPE;
 	}
 
-	if (intel_cdclk_can_squash(dev_priv,
-				   &old_cdclk_state->actual,
-				   &new_cdclk_state->actual)) {
+	if (intel_cdclk_can_crawl_and_squash(dev_priv,
+					     &old_cdclk_state->actual,
+					     &new_cdclk_state->actual)) {
+		drm_dbg_kms(&dev_priv->drm,
+			    "Can change cdclk via crawling and squashing\n");
+	} else if (intel_cdclk_can_squash(dev_priv,
+					&old_cdclk_state->actual,
+					&new_cdclk_state->actual)) {
 		drm_dbg_kms(&dev_priv->drm,
 			    "Can change cdclk via squashing\n");
 	} else if (intel_cdclk_can_crawl(dev_priv,
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
#6 lore raw
Quoted 71 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, November 8, 2022 3:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Vivekanandan, Balasubramani <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/display: Do both crawl and squash when changing cdclk

Quoted 25 lines · Anusha Srivatsa

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config.
Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

Quoted 5 lines

v6: MTl should not follow PUnit mailbox communication as the rest of gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan

<[email protected]>

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct

Quoted 13 lines
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161
+++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void dg2_cdclk_squash_program(struct

drm_i915_private *i915,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1724

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -3
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);  }
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform) {
+	return hweight16(waveform ?: 0xffff); }
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private *i915,

Bikeshed: maybe name this "cdclk_compute_crawl_squash_midpoint" to help clarify that we're just computing stuff here and not actually programming the hardware in this function?

Quoted 2 lines

That naming would also help clarify why we're returning false if we crawl but don't squash or vice versa (i.e., there's no midpoint in those cases).

Makes sense.

Quoted 15 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1722

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*old_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1723

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*new_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1727

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   struct intel_cdclk_config *mid_cdclk_config)

{

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +9 -0
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, old_cdclk_config-
Quoted 8 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1741

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
 cdclk);
+	new_waveform = cdclk_squash_waveform(i915, new_cdclk_config-
 cdclk);
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0 ||

Isn't vco unsigned? "== 0" should be fine here I think.

You mean the new_cdclk_config->vco right?

Quoted 112 lines
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
+	    old_cdclk_config->vco == new_cdclk_config->vco ||
+	    old_waveform == new_waveform)
+		return false;
+

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+	*mid_cdclk_config = *new_cdclk_config;
+
+	/* Populate the mid_cdclk_config accordingly.
+	 * - If moving to a higher cdclk, the desired action is squashing.
+	 * The mid cdclk config should have the new (squash) waveform.
+	 * - If moving to a lower cdclk, the desired action is crawling.
+	 * The mid cdclk config should have the new vco.
+	 */
+
+	if (cdclk_squash_divider(new_waveform) >

cdclk_squash_divider(old_waveform)) {

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 8 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+		mid_cdclk_config->vco = old_cdclk_config->vco;
+		mid_waveform = new_waveform;
+	} else {
+		mid_cdclk_config->vco = new_cdclk_config->vco;
+		mid_waveform = old_waveform;
+	}
+
+	mid_cdclk_config->cdclk =

DIV_ROUND_CLOSEST(cdclk_squash_divider(mid_waveform) *

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1762

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+						    mid_cdclk_config->vco, size

* div);

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 8 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+
+	/* make sure the mid clock came out sane */
+
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk <
+		    min(old_cdclk_config->cdclk, new_cdclk_config->cdclk));
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk >
+		    i915->display.cdclk.max_cdclk_freq);
+	drm_WARN_ON(&i915->drm, cdclk_squash_waveform(i915,

mid_cdclk_config->cdclk) !=

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+		    mid_waveform);
+
+	return true;
+}
+
+static void _bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			   const struct intel_cdclk_config *cdclk_config,
+			   enum pipe pipe)
 {

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -5
 	int cdclk = cdclk_config->cdclk;
 	int vco = cdclk_config->vco;
 	u32 val;
 	u16 waveform;
 	int clock;
-	int ret;
-
-	/* Inform power controller of upcoming frequency change. */
-	if (DISPLAY_VER(dev_priv) >= 11)
-		ret = skl_pcode_request(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -10
-					SKL_CDCLK_PREPARE_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE, 3);
-	else
-		/*
-		 * BSpec requires us to wait up to 150usec, but that leads to
-		 * timeouts; the 2ms used here is based on experiment.
-		 */
-		ret = snb_pcode_write_timeout(&dev_priv->uncore,
-

HSW_PCODE_DE_WRITE_FREQ_REQ,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -4
-					      0x80000000, 150, 2);
-	if (ret) {
-		drm_err(&dev_priv->drm,
-			"Failed to inform PCU about cdclk change (err %d,

freq %d)\n",

Quoted 7 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -3
-			ret, cdclk);
-		return;
-	}
 
 	if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco

0 && vco > 0) {
if (dev_priv->display.cdclk.hw.vco != vco) @@ -1781,6

+1818,49 @@

Quoted 4 lines

static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

if (pipe != INVALID_PIPE)

intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv,

Quoted 6 lines

pipe));

drivers/gpu/drm/i915/display/intel_cdclk.c +5 -0
+}
+
+static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			  const struct intel_cdclk_config *cdclk_config,
+			  enum pipe pipe)

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · line 1835

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+{
+	struct intel_cdclk_config mid_cdclk_config;
+	int cdclk = cdclk_config->cdclk;
+	int ret;
+
+	/* Inform power controller of upcoming frequency change.
+	 * MTL does not follow the PUnit mailbox communication, skip
+	 * this for MTL.
+	 */
+	if (!IS_METEORLAKE(dev_priv)) {

Is there a reason to believe that we'll go back to using pcode again on future platforms? If not, then it would be preferable to use a version check here like

        if (DISPLAY_VER(dev_priv) >= 14)

since we usually assume future platforms will follow the newest platform's behavior.

It also might be best to flatten this out rather than using nested if's.

Quoted 9 lines
        int ret = 0;

        if (display >= 14) {
                /* noop; Pcode not used for this */
        } else if (display >= 11) {
                pcode_request...
        } else {
                pcode_write_timeout...
        }

That's is definitely neater.
Does the rest of the patch look good?

Anusha

Quoted 97 lines

Matt

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +2 -0
+		if (DISPLAY_VER(dev_priv) >= 11)
+			ret = skl_pcode_request(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

Quoted 1 line

+

SKL_CDCLK_PREPARE_FOR_CHANGE,

Quoted 1 line

+

SKL_CDCLK_READY_FOR_CHANGE,

Quoted 1 line

+

	SKL_CDCLK_READY_FOR_CHANGE, 3);

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +3 -0
+		else
+			/*
+			 * BSpec requires us to wait up to 150usec, but that

leads to

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+			 * timeouts; the 2ms used here is based on

experiment.

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · line 1856

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +3 -0
+			 */
+			ret = snb_pcode_write_timeout(&dev_priv->uncore,
+

HSW_PCODE_DE_WRITE_FREQ_REQ,

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
+						      0x80000000, 150, 2);
+		if (ret) {
+			drm_err(&dev_priv->drm,
+				"Failed to inform PCU about cdclk change (err

%d, freq %d)\n",

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +5 -0
+				ret, cdclk);
+			return;
+		}
+	}
+

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7 -0
+	if (cdclk_crawl_and_squash(dev_priv, &dev_priv->display.cdclk.hw,
+				   cdclk_config, &mid_cdclk_config)) {
+		_bxt_set_cdclk(dev_priv, &mid_cdclk_config, pipe);
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	} else {
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	}
 
 	if (DISPLAY_VER(dev_priv) >= 11) {
 		ret = snb_pcode_write(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
@@ -1953,6 +2033,26 @@ void intel_cdclk_uninit_hw(struct

drm_i915_private *i915)

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct drm_i915_private *i915)

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
 		skl_cdclk_uninit_hw(i915);
 }
 
+static bool intel_cdclk_can_crawl_and_squash(struct drm_i915_private

*i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+					     const struct intel_cdclk_config *a,
+					     const struct intel_cdclk_config *b) {
+	u16 old_waveform;
+	u16 new_waveform;
+
+	if (a->vco == 0 || b->vco == 0)
+		return false;
+
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct drm_i915_private *i915)

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7 -0
+
+	old_waveform = cdclk_squash_waveform(i915, a->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, b->cdclk);
+
+	return a->vco != b->vco &&
+	       old_waveform != new_waveform; }
+
 static bool intel_cdclk_can_crawl(struct drm_i915_private *dev_priv,
 				  const struct intel_cdclk_config *a,
 				  const struct intel_cdclk_config *b) @@ -

2759,9 +2859,14 @@ int

Quoted 19 lines

intel_modeset_calc_cdclk(struct intel_atomic_state *state)

drivers/gpu/drm/i915/display/intel_cdclk.c +8 -4
 			pipe = INVALID_PIPE;
 	}
 
-	if (intel_cdclk_can_squash(dev_priv,
-				   &old_cdclk_state->actual,
-				   &new_cdclk_state->actual)) {
+	if (intel_cdclk_can_crawl_and_squash(dev_priv,
+					     &old_cdclk_state->actual,
+					     &new_cdclk_state->actual)) {
+		drm_dbg_kms(&dev_priv->drm,
+			    "Can change cdclk via crawling and squashing\n");
+	} else if (intel_cdclk_can_squash(dev_priv,
+					&old_cdclk_state->actual,
+					&new_cdclk_state->actual)) {
 		drm_dbg_kms(&dev_priv->drm,
 			    "Can change cdclk via squashing\n");
 	} else if (intel_cdclk_can_crawl(dev_priv,
--
Quoted 2 lines

2.25.1

--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation

#7 lore raw
Quoted 100 lines · Anusha
Quoted 71 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, November 8, 2022 3:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Vivekanandan, Balasubramani <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/display: Do both crawl and squash when changing cdclk

Quoted 25 lines · Anusha Srivatsa

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config.
Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

Quoted 5 lines

v6: MTl should not follow PUnit mailbox communication as the rest of gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan

<[email protected]>

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct

Quoted 13 lines
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161
+++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void dg2_cdclk_squash_program(struct

drm_i915_private *i915,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1724

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -3
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);  }
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform) {
+	return hweight16(waveform ?: 0xffff); }
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private *i915,

Bikeshed: maybe name this "cdclk_compute_crawl_squash_midpoint" to help clarify that we're just computing stuff here and not actually programming the hardware in this function?

Quoted 2 lines

That naming would also help clarify why we're returning false if we crawl but don't squash or vice versa (i.e., there's no midpoint in those cases).

Makes sense.

Quoted 15 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1722

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*old_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1723

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*new_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1727

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   struct intel_cdclk_config *mid_cdclk_config)

{

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +9 -0
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, old_cdclk_config-
Quoted 8 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1741

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
 cdclk);
+	new_waveform = cdclk_squash_waveform(i915, new_cdclk_config-
 cdclk);
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0 ||

Isn't vco unsigned? "== 0" should be fine here I think.

Quoted 1 line

You mean the new_cdclk_config->vco right?

Both of them I think. The vco field of intel_cdclk_config can't take on negative values because it's defined as unsigned:

        struct intel_cdclk_config {
                unsigned int cdclk, vco, ref, bypass;
                u8 voltage_level;
        };
Quoted 121 lines
Quoted 112 lines
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
+	    old_cdclk_config->vco == new_cdclk_config->vco ||
+	    old_waveform == new_waveform)
+		return false;
+

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+	*mid_cdclk_config = *new_cdclk_config;
+
+	/* Populate the mid_cdclk_config accordingly.
+	 * - If moving to a higher cdclk, the desired action is squashing.
+	 * The mid cdclk config should have the new (squash) waveform.
+	 * - If moving to a lower cdclk, the desired action is crawling.
+	 * The mid cdclk config should have the new vco.
+	 */
+
+	if (cdclk_squash_divider(new_waveform) >

cdclk_squash_divider(old_waveform)) {

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 8 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+		mid_cdclk_config->vco = old_cdclk_config->vco;
+		mid_waveform = new_waveform;
+	} else {
+		mid_cdclk_config->vco = new_cdclk_config->vco;
+		mid_waveform = old_waveform;
+	}
+
+	mid_cdclk_config->cdclk =

DIV_ROUND_CLOSEST(cdclk_squash_divider(mid_waveform) *

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1762

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+						    mid_cdclk_config->vco, size

* div);

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 8 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+
+	/* make sure the mid clock came out sane */
+
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk <
+		    min(old_cdclk_config->cdclk, new_cdclk_config->cdclk));
+	drm_WARN_ON(&i915->drm, mid_cdclk_config->cdclk >
+		    i915->display.cdclk.max_cdclk_freq);
+	drm_WARN_ON(&i915->drm, cdclk_squash_waveform(i915,

mid_cdclk_config->cdclk) !=

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -0
+		    mid_waveform);
+
+	return true;
+}
+
+static void _bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			   const struct intel_cdclk_config *cdclk_config,
+			   enum pipe pipe)
 {

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -5
 	int cdclk = cdclk_config->cdclk;
 	int vco = cdclk_config->vco;
 	u32 val;
 	u16 waveform;
 	int clock;
-	int ret;
-
-	/* Inform power controller of upcoming frequency change. */
-	if (DISPLAY_VER(dev_priv) >= 11)
-		ret = skl_pcode_request(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -10
-					SKL_CDCLK_PREPARE_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE,
-					SKL_CDCLK_READY_FOR_CHANGE, 3);
-	else
-		/*
-		 * BSpec requires us to wait up to 150usec, but that leads to
-		 * timeouts; the 2ms used here is based on experiment.
-		 */
-		ret = snb_pcode_write_timeout(&dev_priv->uncore,
-

HSW_PCODE_DE_WRITE_FREQ_REQ,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -4
-					      0x80000000, 150, 2);
-	if (ret) {
-		drm_err(&dev_priv->drm,
-			"Failed to inform PCU about cdclk change (err %d,

freq %d)\n",

Quoted 7 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -3
-			ret, cdclk);
-		return;
-	}
 
 	if (HAS_CDCLK_CRAWL(dev_priv) && dev_priv->display.cdclk.hw.vco

0 && vco > 0) {
if (dev_priv->display.cdclk.hw.vco != vco) @@ -1781,6

+1818,49 @@

Quoted 4 lines

static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

if (pipe != INVALID_PIPE)

intel_crtc_wait_for_next_vblank(intel_crtc_for_pipe(dev_priv,

Quoted 6 lines

pipe));

drivers/gpu/drm/i915/display/intel_cdclk.c +5 -0
+}
+
+static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
+			  const struct intel_cdclk_config *cdclk_config,
+			  enum pipe pipe)

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · line 1835

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+{
+	struct intel_cdclk_config mid_cdclk_config;
+	int cdclk = cdclk_config->cdclk;
+	int ret;
+
+	/* Inform power controller of upcoming frequency change.
+	 * MTL does not follow the PUnit mailbox communication, skip
+	 * this for MTL.
+	 */
+	if (!IS_METEORLAKE(dev_priv)) {

Is there a reason to believe that we'll go back to using pcode again on future platforms? If not, then it would be preferable to use a version check here like

        if (DISPLAY_VER(dev_priv) >= 14)

since we usually assume future platforms will follow the newest platform's behavior.

It also might be best to flatten this out rather than using nested if's.

Quoted 9 lines
        int ret = 0;

        if (display >= 14) {
                /* noop; Pcode not used for this */
        } else if (display >= 11) {
                pcode_request...
        } else {
                pcode_write_timeout...
        }
Quoted 2 lines

That's is definitely neater.
Does the rest of the patch look good?

Yeah, aside from the few minor things I noted, the rest of this patch looks good to me.

Matt

Quoted 99 lines

Anusha

Quoted 97 lines

Matt

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +2 -0
+		if (DISPLAY_VER(dev_priv) >= 11)
+			ret = skl_pcode_request(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

Quoted 1 line

+

SKL_CDCLK_PREPARE_FOR_CHANGE,

Quoted 1 line

+

SKL_CDCLK_READY_FOR_CHANGE,

Quoted 1 line

+

	SKL_CDCLK_READY_FOR_CHANGE, 3);

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +3 -0
+		else
+			/*
+			 * BSpec requires us to wait up to 150usec, but that

leads to

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+			 * timeouts; the 2ms used here is based on

experiment.

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv, · line 1856

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +3 -0
+			 */
+			ret = snb_pcode_write_timeout(&dev_priv->uncore,
+

HSW_PCODE_DE_WRITE_FREQ_REQ,

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
+						      0x80000000, 150, 2);
+		if (ret) {
+			drm_err(&dev_priv->drm,
+				"Failed to inform PCU about cdclk change (err

%d, freq %d)\n",

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +5 -0
+				ret, cdclk);
+			return;
+		}
+	}
+

drivers/gpu/drm/i915/display/intel_cdclk.c static void bxt_set_cdclk(struct drm_i915_private *dev_priv,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7 -0
+	if (cdclk_crawl_and_squash(dev_priv, &dev_priv->display.cdclk.hw,
+				   cdclk_config, &mid_cdclk_config)) {
+		_bxt_set_cdclk(dev_priv, &mid_cdclk_config, pipe);
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	} else {
+		_bxt_set_cdclk(dev_priv, cdclk_config, pipe);
+	}
 
 	if (DISPLAY_VER(dev_priv) >= 11) {
 		ret = snb_pcode_write(&dev_priv->uncore,

SKL_PCODE_CDCLK_CONTROL,

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
@@ -1953,6 +2033,26 @@ void intel_cdclk_uninit_hw(struct

drm_i915_private *i915)

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct drm_i915_private *i915)

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
 		skl_cdclk_uninit_hw(i915);
 }
 
+static bool intel_cdclk_can_crawl_and_squash(struct drm_i915_private

*i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10 -0
+					     const struct intel_cdclk_config *a,
+					     const struct intel_cdclk_config *b) {
+	u16 old_waveform;
+	u16 new_waveform;
+
+	if (a->vco == 0 || b->vco == 0)
+		return false;
+
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;

drivers/gpu/drm/i915/display/intel_cdclk.c void intel_cdclk_uninit_hw(struct drm_i915_private *i915)

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7 -0
+
+	old_waveform = cdclk_squash_waveform(i915, a->cdclk);
+	new_waveform = cdclk_squash_waveform(i915, b->cdclk);
+
+	return a->vco != b->vco &&
+	       old_waveform != new_waveform; }
+
 static bool intel_cdclk_can_crawl(struct drm_i915_private *dev_priv,
 				  const struct intel_cdclk_config *a,
 				  const struct intel_cdclk_config *b) @@ -

2759,9 +2859,14 @@ int

Quoted 19 lines

intel_modeset_calc_cdclk(struct intel_atomic_state *state)

drivers/gpu/drm/i915/display/intel_cdclk.c +8 -4
 			pipe = INVALID_PIPE;
 	}
 
-	if (intel_cdclk_can_squash(dev_priv,
-				   &old_cdclk_state->actual,
-				   &new_cdclk_state->actual)) {
+	if (intel_cdclk_can_crawl_and_squash(dev_priv,
+					     &old_cdclk_state->actual,
+					     &new_cdclk_state->actual)) {
+		drm_dbg_kms(&dev_priv->drm,
+			    "Can change cdclk via crawling and squashing\n");
+	} else if (intel_cdclk_can_squash(dev_priv,
+					&old_cdclk_state->actual,
+					&new_cdclk_state->actual)) {
 		drm_dbg_kms(&dev_priv->drm,
 			    "Can change cdclk via squashing\n");
 	} else if (intel_cdclk_can_crawl(dev_priv,
--
Quoted 2 lines

2.25.1

--
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation

Signature · 4 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
#8 lore raw
Quoted 103 lines · Matt Roper
Quoted 100 lines · Anusha
Quoted 71 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, November 8, 2022 3:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Vivekanandan, Balasubramani <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/display: Do both crawl and squash when changing cdclk

Quoted 25 lines · Anusha Srivatsa

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config.
Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

Quoted 5 lines

v6: MTl should not follow PUnit mailbox communication as the rest of gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan

<[email protected]>

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct

Quoted 13 lines
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161
+++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void dg2_cdclk_squash_program(struct

drm_i915_private *i915,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1724

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -3
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);  }
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform) {
+	return hweight16(waveform ?: 0xffff); }
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private *i915,

Bikeshed: maybe name this "cdclk_compute_crawl_squash_midpoint" to help clarify that we're just computing stuff here and not actually programming the hardware in this function?

Quoted 2 lines

That naming would also help clarify why we're returning false if we crawl but don't squash or vice versa (i.e., there's no midpoint in those cases).

Makes sense.

Quoted 15 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1722

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*old_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct · line 1723

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*new_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1727

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   struct intel_cdclk_config *mid_cdclk_config)

{

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +9 -0
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915, old_cdclk_config-
Quoted 8 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915, · line 1741

Quoted 6 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
 cdclk);
+	new_waveform = cdclk_squash_waveform(i915, new_cdclk_config-
 cdclk);
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0 ||

Isn't vco unsigned? "== 0" should be fine here I think.

Quoted 1 line

You mean the new_cdclk_config->vco right?

Quoted 7 lines

Both of them I think. The vco field of intel_cdclk_config can't take on negative values because it's defined as unsigned:

        struct intel_cdclk_config {
                unsigned int cdclk, vco, ref, bypass;
                u8 voltage_level;
        };

Hmm. I guess I used the vco=-1 in sanitize() as a way to effectively write vco=~0, the point of which was force the PLL to be fully disabled first regardless of what its current state is.

But now that I look at that we might have an issue with platforms that support crawling. We wrote that code as if vco is signed so it's actually going to take the crawl path now that it looks like the PLL was prevsiously on. I think we need to add an explicit check to not do the crawl for the vco=~0/-1 case...

Signature · 2 lines
Ville Syrjälä
Intel
#9 lore raw
Quoted 137 lines

-----Original Message-----
From: Ville Syrjälä <[email protected]>
Sent: Wednesday, November 9, 2022 3:30 AM
To: Roper, Matthew D <[email protected]>
Cc: Srivatsa, Anusha <[email protected]>; intel- [email protected]; Vivekanandan, Balasubramani <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/display: Do both crawl and squash when changing cdclk

Quoted 76 lines · Matt Roper
Quoted 75 lines · Anusha
Quoted 75 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, November 8, 2022 3:43 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Vivekanandan, Balasubramani <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915/display: Do both crawl and squash when changing cdclk

Quoted 26 lines · Anusha Srivatsa

From: Ville Syrjälä <[email protected]>

For MTL, changing cdclk from between certain frequencies has both squash and crawl. Use the current cdclk config and the new(desired) cdclk config to construtc a mid cdclk config. Set the cdclk twice:
- Current cdclk -> mid cdclk
- mid cdclk -> desired cdclk

v2: Add check in intel_modeset_calc_cdclk() to avoid cdclk change via modeset for platforms that support squash_crawl sequences(Ville)

v3: Add checks for:
- scenario where only slow clock is used and cdclk is actually 0 (bringing up display).
- PLLs are on before looking up the waveform.
- Squash and crawl capability checks.(Ville)

v4: Rebase
- Move checks to be more consistent (Ville)
- Add comments (Bala)
v5:
- Further small changes. Move checks around.
- Make if-else better looking (Ville)

Quoted 6 lines

v6: MTl should not follow PUnit mailbox communication as the rest of
gen11+ platforms.(Anusha)

Cc Clint Taylor <[email protected]>
Cc Balasubramani Vivekanandan

<[email protected]>

Quoted 13 lines
---
 drivers/gpu/drm/i915/display/intel_cdclk.c | 161
+++++++++++++++++----
 1 file changed, 133 insertions(+), 28 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +0 -0
index eada931cb1c8..d1e0763513be 100644
@@ -1716,37 +1716,74 @@ static void
Quoted 1 line

dg2_cdclk_squash_program(struct

drm_i915_private *i915,

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +5 -3
 	intel_de_write(i915, CDCLK_SQUASH_CTL, squash_ctl);  }
 
-static void bxt_set_cdclk(struct drm_i915_private *dev_priv,
-			  const struct intel_cdclk_config *cdclk_config,
-			  enum pipe pipe)
+static int cdclk_squash_divider(u16 waveform) {
+	return hweight16(waveform ?: 0xffff); }
+
+static bool cdclk_crawl_and_squash(struct drm_i915_private
+*i915,

Bikeshed: maybe name this "cdclk_compute_crawl_squash_midpoint" to help clarify that we're just computing stuff here and not actually programming the hardware in this function?

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

That naming would also help clarify why we're returning false if we crawl but don't squash or vice versa (i.e., there's no midpoint in

those cases).

Quoted 8 lines
Quoted 8 lines

Makes sense.

Quoted 5 lines

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*old_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   const struct intel_cdclk_config

*new_cdclk_config,

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 1 line
drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+				   struct intel_cdclk_config

*mid_cdclk_config)

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

{

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +9 -0
+	u16 old_waveform, new_waveform, mid_waveform;
+	int size = 16;
+	int div = 2;
+
+	/* Return if both Squash and Crawl are not present */
+	if (!HAS_CDCLK_CRAWL(i915) || !HAS_CDCLK_SQUASH(i915))
+		return false;
+
+	old_waveform = cdclk_squash_waveform(i915,

old_cdclk_config-

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/display/intel_cdclk.c

Quoted 2 lines

cdclk);

drivers/gpu/drm/i915/display/intel_cdclk.c +1 -0
+	new_waveform = cdclk_squash_waveform(i915,

new_cdclk_config-

Quoted 10 lines
Quoted 9 lines
Quoted 7 lines

drivers/gpu/drm/i915/display/intel_cdclk.c static void dg2_cdclk_squash_program(struct drm_i915_private *i915,

Quoted 5 lines

cdclk);

drivers/gpu/drm/i915/display/intel_cdclk.c +4 -0
+
+	/* Return if Squash only or Crawl only is the desired action */
+	if (old_cdclk_config->vco <= 0 || new_cdclk_config->vco <= 0
+||

Isn't vco unsigned? "== 0" should be fine here I think.

You mean the new_cdclk_config->vco right?

Quoted 7 lines

Both of them I think. The vco field of intel_cdclk_config can't take on negative values because it's defined as unsigned:

        struct intel_cdclk_config {
                unsigned int cdclk, vco, ref, bypass;
                u8 voltage_level;
        };

Hmm. I guess I used the vco=-1 in sanitize() as a way to effectively write vco=~0, the point of which was force the PLL to be fully disabled first regardless of what its current state is.

Quoted 5 lines

But now that I look at that we might have an issue with platforms that support crawling. We wrote that code as if vco is signed so it's actually going to take the crawl path now that it looks like the PLL was prevsiously on. I think we need to add an explicit check to not do the crawl for the vco=~0/-1 case...

@Ville Syrjälä in bxt_sanitize_cdclk() do we need the scenario:
dev_priv->cdclk.hw.vco = -1; ?

Anusha

Quoted 4 lines

--
Ville Syrjälä
Intel