Skip to contentSkip to conversation

drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug

PATCH Superseded José Roberto de Souza 3 participants 6 messages Feb 1, 2019 – Feb 6, 2019

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug

Changing the i915_edp_psr_debug was enabling, disabling or switching PSR version by directly calling intel_psr_disable_locked() and intel_psr_enable_locked(), what is not the default PSR path that will be executed by real users.

So lets force a fastset in the PSR CRTC to trigger a pipe update and stress the default code path.

Recently a bug was found when switching from PSR2 to PSR1 while enable_psr kernel parameter was set to the default parameter, this changes fix it and also fixes the bug linked bellow were DRRS was left enabled together with PSR when enabling PSR from debugfs.

v2: Handling missing case: disabled to PSR1

v3: Not duplicating the whole atomic state(Maarten)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108341

Cc Maarten Lankhorst <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  14 +--
 drivers/gpu/drm/i915/i915_drv.h     |   2 +-
 drivers/gpu/drm/i915/intel_ddi.c    |   2 +-
 drivers/gpu/drm/i915/intel_drv.h    |   6 +-
 drivers/gpu/drm/i915/intel_psr.c    | 188 +++++++++++++++++-----------
 5 files changed, 119 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -13
index fa2c226fc779..766a5b4ad3d6 100644
@@ -2607,7 +2607,6 @@ static int
 i915_edp_psr_debug_set(void *data, u64 val)
 {
 	struct drm_i915_private *dev_priv = data;
-	struct drm_modeset_acquire_ctx ctx;
 	intel_wakeref_t wakeref;
 	int ret;
 
@@ -2618,18 +2617,7 @@ i915_edp_psr_debug_set(void *data, u64 val)
 
 	wakeref = intel_runtime_pm_get(dev_priv);
 
-	drm_modeset_acquire_init(&ctx, DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
-
-retry:
-	ret = intel_psr_set_debugfs_mode(dev_priv, &ctx, val);
-	if (ret == -EDEADLK) {
-		ret = drm_modeset_backoff(&ctx);
-		if (!ret)
-			goto retry;
-	}
-
-	drm_modeset_drop_locks(&ctx);
-	drm_modeset_acquire_fini(&ctx);
+	ret = intel_psr_set_debugfs_mode(dev_priv, val);
 
 	intel_runtime_pm_put(dev_priv, wakeref);
 
drivers/gpu/drm/i915/i915_drv.h +1 -1
index f11c66d172d3..baee581a0d5b 100644
@@ -496,7 +496,7 @@ struct i915_psr {
 
 	u32 debug;
 	bool sink_support;
-	bool prepared, enabled;
+	bool enabled;
 	struct intel_dp *dp;
 	enum pipe pipe;
 	bool active;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
index ca705546a0ab..9211e4579489 100644
@@ -3556,7 +3556,7 @@ static void intel_ddi_update_pipe_dp(struct intel_encoder *encoder,
 {
 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
-	intel_psr_enable(intel_dp, crtc_state);
+	intel_psr_update(intel_dp, crtc_state);
 	intel_edp_drrs_enable(intel_dp, crtc_state);
 
 	intel_panel_update_backlight(encoder, crtc_state, conn_state);
drivers/gpu/drm/i915/intel_drv.h +3 -3
index 90ba5436370e..4c01decc30d3 100644
@@ -2067,9 +2067,9 @@ void intel_psr_enable(struct intel_dp *intel_dp,
 		      const struct intel_crtc_state *crtc_state);
 void intel_psr_disable(struct intel_dp *intel_dp,
 		      const struct intel_crtc_state *old_crtc_state);
-int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 value);
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state);
+int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, u64 value);
 void intel_psr_invalidate(struct drm_i915_private *dev_priv,
 			  unsigned frontbuffer_bits,
 			  enum fb_op_origin origin);
drivers/gpu/drm/i915/intel_psr.c +113 -75

250 lines not on this page · raw message

Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug (rev3)

== Series Details ==

== Series Details ==

Series: drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug (rev3)
URL : https://patchwork.freedesktop.org/series/56013/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5522 -> Patchwork_12115
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/56013/revisions/3/mbox/

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: NOTRUN -> INCOMPLETE [fdo#107718]

* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927]

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS

* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- fi-kbl-7567u: {SKIP} [fdo#109271] -> PASS +1

* igt@prime_vgem@basic-fence-flip:
- fi-kbl-7500u: {SKIP} [fdo#109271] -> PASS +33

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

[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271

Participating hosts (49 -> 45)
------------------------------

Missing (4): fi-kbl-soraka fi-ctg-p8600 fi-bsw-cyan fi-ilk-m540

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

* Linux: CI_DRM_5522 -> Patchwork_12115

CI_DRM_5522: 3f287cb6d4ae4689eb7c53e4c25f0fba3df16438 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4802: 4049adf01014af077df2174def4fadf7cecb066e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12115: 918de5c71b79aba838256f798383ca2a506b4d82 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

918de5c71b79 drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12115/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug (rev3)

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: drm/i915/psr: Execute the default PSR code path when setting i915_edp_psr_debug (rev3)
URL : https://patchwork.freedesktop.org/series/56013/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5522_full -> Patchwork_12115_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_eio@reset-stress:
- shard-hsw: PASS -> INCOMPLETE [fdo#103540] / [fdo#109482]

* igt@kms_color@pipe-c-degamma:
- shard-apl: PASS -> FAIL [fdo#104782]

* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-apl: PASS -> FAIL [fdo#103232] +1

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: PASS -> FAIL [fdo#105363]

* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +2
- shard-apl: PASS -> FAIL [fdo#103166] +1

#### Possible fixes ####

* igt@gem_exec_blt@cold:
- shard-glk: DMESG-WARN [fdo#105763] / [fdo#106538] -> PASS

* igt@kms_cursor_crc@cursor-256x256-onscreen:
- shard-glk: FAIL [fdo#103232] -> PASS

* igt@kms_cursor_crc@cursor-256x85-random:
- shard-apl: FAIL [fdo#103232] -> PASS

* igt@kms_plane@plane-position-covered-pipe-b-planes:
- shard-glk: FAIL [fdo#103166] -> PASS +1

* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-apl: FAIL [fdo#103166] -> PASS +2

* igt@kms_setmode@basic:
- shard-hsw: FAIL [fdo#99912] -> PASS

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

[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106538]: https://bugs.freedesktop.org/show_bug.cgi?id=106538
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109482]: https://bugs.freedesktop.org/show_bug.cgi?id=109482
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

Participating hosts (6 -> 4)
------------------------------

Missing (2): shard-skl shard-iclb

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

* Linux: CI_DRM_5522 -> Patchwork_12115

CI_DRM_5522: 3f287cb6d4ae4689eb7c53e4c25f0fba3df16438 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4802: 4049adf01014af077df2174def4fadf7cecb066e @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12115: 918de5c71b79aba838256f798383ca2a506b4d82 @ 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_12115/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to José Roberto de Souza
Quoted 153 lines · José Roberto de Souza

Changing the i915_edp_psr_debug was enabling, disabling or switching PSR version by directly calling intel_psr_disable_locked() and intel_psr_enable_locked(), what is not the default PSR path that will be executed by real users.

So lets force a fastset in the PSR CRTC to trigger a pipe update and stress the default code path.

Recently a bug was found when switching from PSR2 to PSR1 while enable_psr kernel parameter was set to the default parameter, this changes fix it and also fixes the bug linked bellow were DRRS was left enabled together with PSR when enabling PSR from debugfs.

v2: Handling missing case: disabled to PSR1

v3: Not duplicating the whole atomic state(Maarten)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108341

Cc Maarten Lankhorst <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  14 +--
 drivers/gpu/drm/i915/i915_drv.h     |   2 +-
 drivers/gpu/drm/i915/intel_ddi.c    |   2 +-
 drivers/gpu/drm/i915/intel_drv.h    |   6 +-
 drivers/gpu/drm/i915/intel_psr.c    | 188 +++++++++++++++++---------
--
 5 files changed, 119 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -13
index fa2c226fc779..766a5b4ad3d6 100644
@@ -2607,7 +2607,6 @@ static int
 i915_edp_psr_debug_set(void *data, u64 val)
 {
 	struct drm_i915_private *dev_priv = data;
-	struct drm_modeset_acquire_ctx ctx;
 	intel_wakeref_t wakeref;
 	int ret;
 
@@ -2618,18 +2617,7 @@ i915_edp_psr_debug_set(void *data, u64 val)
 
 	wakeref = intel_runtime_pm_get(dev_priv);
 
-	drm_modeset_acquire_init(&ctx,
 DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
-
-retry:
-	ret = intel_psr_set_debugfs_mode(dev_priv, &ctx, val);
-	if (ret == -EDEADLK) {
-		ret = drm_modeset_backoff(&ctx);
-		if (!ret)
-			goto retry;
-	}
-
-	drm_modeset_drop_locks(&ctx);
-	drm_modeset_acquire_fini(&ctx);
+	ret = intel_psr_set_debugfs_mode(dev_priv, val);
 
 	intel_runtime_pm_put(dev_priv, wakeref);
drivers/gpu/drm/i915/i915_drv.h +1 -1
index f11c66d172d3..baee581a0d5b 100644
@@ -496,7 +496,7 @@ struct i915_psr {
 
 	u32 debug;
 	bool sink_support;
-	bool prepared, enabled;
+	bool enabled;
 	struct intel_dp *dp;
 	enum pipe pipe;
 	bool active;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
index ca705546a0ab..9211e4579489 100644
@@ -3556,7 +3556,7 @@ static void intel_ddi_update_pipe_dp(struct
 intel_encoder *encoder,
 {
 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
-	intel_psr_enable(intel_dp, crtc_state);
+	intel_psr_update(intel_dp, crtc_state);
 	intel_edp_drrs_enable(intel_dp, crtc_state);
 
drivers/gpu/drm/i915/intel_ddi.c +0 -0
 	intel_panel_update_backlight(encoder, crtc_state, conn_state);
drivers/gpu/drm/i915/intel_drv.h +3 -3
index 90ba5436370e..4c01decc30d3 100644
@@ -2067,9 +2067,9 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 		      const struct intel_crtc_state *crtc_state);
 void intel_psr_disable(struct intel_dp *intel_dp,
 		      const struct intel_crtc_state *old_crtc_state);
-int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 value);
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state);
+int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
 u64 value);
 void intel_psr_invalidate(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_drv.h +0 -0
 			  unsigned frontbuffer_bits,
 			  enum fb_op_origin origin);
drivers/gpu/drm/i915/intel_psr.c +0 -0
index 84a0fb981561..e970ffd7dd0d 100644
@@ -51,6 +51,8 @@
  * must be correctly synchronized/cancelled when shutting down the

pipe."
*/

drivers/gpu/drm/i915/intel_psr.c +7 -2
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
 
 #include "intel_drv.h"
 #include "i915_drv.h"
@@ -718,8 +720,11 @@ static void intel_psr_enable_locked(struct
 drm_i915_private *dev_priv,
 {
 	struct intel_dp *intel_dp = dev_priv->psr.dp;
 
-	if (dev_priv->psr.enabled)
-		return;
+	WARN_ON(dev_priv->psr.enabled);
+
+	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
+	dev_priv->psr.busy_frontbuffer_bits = 0;
+	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 >pipe;
drivers/gpu/drm/i915/intel_psr.c +0 -2
 	DRM_DEBUG_KMS("Enabling PSR%s\n",
 		      dev_priv->psr.psr2_enabled ? "2" : "1");
@@ -752,20 +757,13 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 	WARN_ON(dev_priv->drrs.dp);
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (dev_priv->psr.prepared) {
-		DRM_DEBUG_KMS("PSR already in use\n");

drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp · line 764

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3 -3
+
+	if (!psr_global_enabled(dev_priv->psr.debug)) {
+		DRM_DEBUG_KMS("PSR disabled by flag\n");
 		goto unlock;
 	}
 
-	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
-	dev_priv->psr.busy_frontbuffer_bits = 0;
-	dev_priv->psr.prepared = true;

Since you are removing .prepared, is there a need for psr_enable/psr_enable_locked separation? Same with disable and disable_locked? The whole thing was added before fastset to avoid modesets.

Quoted 47 lines
drivers/gpu/drm/i915/intel_psr.c +1 -6
-	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 >pipe;
-
-	if (psr_global_enabled(dev_priv->psr.debug))
-		intel_psr_enable_locked(dev_priv, crtc_state);
-	else
-		DRM_DEBUG_KMS("PSR disabled by flag\n");
+	intel_psr_enable_locked(dev_priv, crtc_state);

unlock:

drivers/gpu/drm/i915/intel_psr.c +9 -5
 	mutex_unlock(&dev_priv->psr.lock);
@@ -848,18 +846,62 @@ void intel_psr_disable(struct intel_dp
 *intel_dp,
 		return;
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (!dev_priv->psr.prepared) {
-		mutex_unlock(&dev_priv->psr.lock);
-		return;
-	}
 
 	intel_psr_disable_locked(intel_dp);
 
-	dev_priv->psr.prepared = false;
 	mutex_unlock(&dev_priv->psr.lock);
 	cancel_work_sync(&dev_priv->psr.work);
 }
 
+#define PSR_MODE_STRING_GET(enabled, psr2_enabled) \
+		enabled ? (psr2_enabled ? "PSR2" : "PSR1") : "disabled"
+
+/**
+ * intel_psr_update - Update PSR state
+ * @intel_dp: Intel DP
+ * @crtc_state: new CRTC state
+ *
+ * This functions will update PSR states, disabling, enabling or

switching PSR
+ * version when executing fastsets. For full modeset, intel_psr_disable() and
+ * intel_psr_enable() should be called instead.
+ */

drivers/gpu/drm/i915/intel_psr.c +5 -0
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+	struct i915_psr *psr = &dev_priv->psr;

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 882

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +10 -0
+	bool enable, psr2_enable;
+	const char *old_mode, *new_mode;
+
+	if (!CAN_PSR(dev_priv) || READ_ONCE(psr->dp) != intel_dp)
+		return;
+
+	mutex_lock(&dev_priv->psr.lock);
+
+	enable = crtc_state->has_psr && psr_global_enabled(psr->debug);
+	psr2_enable = intel_psr2_enabled(dev_priv, crtc_state);

This gets computed again in psr_enable_locked(). Move the assignment of dev_priv->psr.psr2_enabled outside of psr_enable_locked() ?

Looking at the diff, this patch moved it down to psr_enable_locked(), why?

drivers/gpu/drm/i915/intel_psr.c

Quoted 2 lines
drivers/gpu/drm/i915/intel_psr.c +2 -0
+
+	if (psr->enabled == enable && psr2_enable == psr->psr2_enabled)

nit: keeping the order consistent makes it easy to read IMO

if (enable == psr->enabled && psr2_enable == psr->psr2_enabled)

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 889

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3 -0
+		goto unlock;
+
+	old_mode = PSR_MODE_STRING_GET(psr->enabled, psr-
Quoted 1 line

psr2_enabled);

drivers/gpu/drm/i915/intel_psr.c +2 -0
+	new_mode = PSR_MODE_STRING_GET(enable, psr2_enable);
+	DRM_DEBUG_KMS("Updating from %s to %s", old_mode, new_mode);

Both intel_psr_{enable, disable}_locked() print what's happening, doesn't look like this adds a any new information.

Quoted 69 lines
drivers/gpu/drm/i915/intel_psr.c +42 -10
+
+	if (psr->enabled) {
+		if (!enable || psr2_enable != psr->psr2_enabled)
+			intel_psr_disable_locked(intel_dp);
+	}
+
+	if (enable) {
+		if (!psr->enabled || psr2_enable != psr->psr2_enabled)
+			intel_psr_enable_locked(dev_priv, crtc_state);
+	}
+
+unlock:
+	mutex_unlock(&dev_priv->psr.lock);
+}
+
 /**
  * intel_psr_wait_for_idle - wait for PSR1 to idle
  * @new_crtc_state: new CRTC state
@@ -924,36 +966,63 @@ static bool __psr_wait_for_idle_locked(struct
 drm_i915_private *dev_priv)
 	return err == 0 && dev_priv->psr.enabled;
 }
 
-static bool switching_psr(struct drm_i915_private *dev_priv,
-			  struct intel_crtc_state *crtc_state,
-			  u32 mode)
+static int intel_psr_fastset_force(struct drm_i915_private
 *dev_priv)
 {
-	/* Can't switch psr state anyway if PSR2 is not supported. */
-	if (!crtc_state || !crtc_state->has_psr2)
-		return false;
+	struct drm_device *dev = &dev_priv->drm;
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_atomic_state *state;
+	struct drm_crtc *crtc;
+	int err;
 
-	if (dev_priv->psr.psr2_enabled && mode ==
 I915_PSR_DEBUG_FORCE_PSR1)
-		return true;
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
 
-	if (!dev_priv->psr.psr2_enabled && mode !=
 I915_PSR_DEBUG_FORCE_PSR1)
-		return true;
+	drm_modeset_acquire_init(&ctx,
 DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
+	state->acquire_ctx = &ctx;
+
+retry:
+	drm_for_each_crtc(crtc, dev) {
+		struct drm_crtc_state *crtc_state;
+		struct intel_crtc_state *intel_crtc_state;
+
+		crtc_state = drm_atomic_get_crtc_state(state, crtc);
+		if (IS_ERR(crtc_state)) {
+			err = PTR_ERR(crtc_state);
+			goto error;
+		}
+
+		intel_crtc_state = to_intel_crtc_state(crtc_state);
+
+		if (intel_crtc_has_type(intel_crtc_state,
 INTEL_OUTPUT_EDP)) {
+			/* Mark mode as changed to trigger a pipe-
Quoted 1 line

update() */

drivers/gpu/drm/i915/intel_psr.c static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv) · line 999

Quoted 1 line
drivers/gpu/drm/i915/intel_psr.c +1 -0
+			crtc_state->mode_changed = true;

Add a flag to commit only if we found a crtc with eDP output? And perhaps, check for crtc_state->has_psr instead of eDP output?

Quoted 89 lines
drivers/gpu/drm/i915/intel_psr.c +19 -4
+			break;
+		}
+	}
+
+	err = drm_atomic_commit(state);
+
+error:
+	if (err == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		err = drm_modeset_backoff(&ctx);
+		if (!err)
+			goto retry;
+	}
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	drm_atomic_state_put(state);
 
-	return false;
+	return err;
 }
 
-int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 val)
+int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,

u64 val)
{

drivers/gpu/drm/i915/intel_psr.c +2 -13
-	struct drm_device *dev = &dev_priv->drm;
-	struct drm_connector_state *conn_state;
-	struct intel_crtc_state *crtc_state = NULL;
-	struct drm_crtc_commit *commit;
-	struct drm_crtc *crtc;
-	struct intel_dp *dp;
+	const u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
+	u32 old_mode;
 	int ret;
-	bool enable;
-	u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
 
 	if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) ||
 	    mode > I915_PSR_DEBUG_FORCE_PSR1) {
@@ -961,49 +1030,18 @@ int intel_psr_set_debugfs_mode(struct
 drm_i915_private *dev_priv,
 		return -EINVAL;
 	}
 
-	ret = drm_modeset_lock(&dev->mode_config.connection_mutex,
 ctx);
-	if (ret)
-		return ret;
-
-	/* dev_priv->psr.dp should be set once and then never touched

again. */

drivers/gpu/drm/i915/intel_psr.c +0 -15
-	dp = READ_ONCE(dev_priv->psr.dp);
-	conn_state = dp->attached_connector->base.state;
-	crtc = conn_state->crtc;
-	if (crtc) {
-		ret = drm_modeset_lock(&crtc->mutex, ctx);
-		if (ret)
-			return ret;
-
-		crtc_state = to_intel_crtc_state(crtc->state);
-		commit = crtc_state->base.commit;
-	} else {
-		commit = conn_state->commit;
-	}
-	if (commit) {
-		ret = wait_for_completion_interruptible(&commit-
Quoted 1 line

hw_done);

drivers/gpu/drm/i915/intel_psr.c +1 -11
-		if (ret)
-			return ret;
-	}
-
 	ret = mutex_lock_interruptible(&dev_priv->psr.lock);
 	if (ret)
 		return ret;
 
-	enable = psr_global_enabled(val);
-
-	if (!enable || switching_psr(dev_priv, crtc_state, mode))
-		intel_psr_disable_locked(dev_priv->psr.dp);
-
+	old_mode = dev_priv->psr.debug & I915_PSR_DEBUG_MODE_MASK;
 	dev_priv->psr.debug = val;
-	if (crtc)
-		dev_priv->psr.psr2_enabled =

intel_psr2_enabled(dev_priv, crtc_state);

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1042

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2 -3
-	intel_psr_irq_control(dev_priv, dev_priv->psr.debug);
+	mutex_unlock(&dev_priv->psr.lock);
 
-	if (dev_priv->psr.prepared && enable)
-		intel_psr_enable_locked(dev_priv, crtc_state);
+	if (old_mode != mode)

What if it was the IRQ debug bit that had changed?

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1046

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +1 -1
+		ret = intel_psr_fastset_force(dev_priv);
 
-	mutex_unlock(&dev_priv->psr.lock);
 	return ret;
 }

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 164 lines · Dhinakaran Pandiyan
Quoted 163 lines · José Roberto de Souza

Changing the i915_edp_psr_debug was enabling, disabling or switching
PSR version by directly calling intel_psr_disable_locked() and intel_psr_enable_locked(), what is not the default PSR path that will
be executed by real users.

So lets force a fastset in the PSR CRTC to trigger a pipe update and
stress the default code path.

Recently a bug was found when switching from PSR2 to PSR1 while enable_psr kernel parameter was set to the default parameter, this changes fix it and also fixes the bug linked bellow were DRRS was left enabled together with PSR when enabling PSR from debugfs.

v2: Handling missing case: disabled to PSR1

v3: Not duplicating the whole atomic state(Maarten)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108341

Cc Maarten Lankhorst <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  14 +--
 drivers/gpu/drm/i915/i915_drv.h     |   2 +-
 drivers/gpu/drm/i915/intel_ddi.c    |   2 +-
 drivers/gpu/drm/i915/intel_drv.h    |   6 +-
 drivers/gpu/drm/i915/intel_psr.c    | 188 +++++++++++++++++-------
--
--
 5 files changed, 119 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -13
index fa2c226fc779..766a5b4ad3d6 100644
@@ -2607,7 +2607,6 @@ static int
 i915_edp_psr_debug_set(void *data, u64 val)
 {
 	struct drm_i915_private *dev_priv = data;
-	struct drm_modeset_acquire_ctx ctx;
 	intel_wakeref_t wakeref;
 	int ret;
 
@@ -2618,18 +2617,7 @@ i915_edp_psr_debug_set(void *data, u64 val)
 
 	wakeref = intel_runtime_pm_get(dev_priv);
 
-	drm_modeset_acquire_init(&ctx,
 DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
-
-retry:
-	ret = intel_psr_set_debugfs_mode(dev_priv, &ctx, val);
-	if (ret == -EDEADLK) {
-		ret = drm_modeset_backoff(&ctx);
-		if (!ret)
-			goto retry;
-	}
-
-	drm_modeset_drop_locks(&ctx);
-	drm_modeset_acquire_fini(&ctx);
+	ret = intel_psr_set_debugfs_mode(dev_priv, val);
 
 	intel_runtime_pm_put(dev_priv, wakeref);
drivers/gpu/drm/i915/i915_drv.h +1 -1
index f11c66d172d3..baee581a0d5b 100644
@@ -496,7 +496,7 @@ struct i915_psr {
 
 	u32 debug;
 	bool sink_support;
-	bool prepared, enabled;
+	bool enabled;
 	struct intel_dp *dp;
 	enum pipe pipe;
 	bool active;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
index ca705546a0ab..9211e4579489 100644
@@ -3556,7 +3556,7 @@ static void intel_ddi_update_pipe_dp(struct
 intel_encoder *encoder,
 {
 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
-	intel_psr_enable(intel_dp, crtc_state);
+	intel_psr_update(intel_dp, crtc_state);
 	intel_edp_drrs_enable(intel_dp, crtc_state);
 
drivers/gpu/drm/i915/intel_ddi.c +0 -0
 	intel_panel_update_backlight(encoder, crtc_state, conn_state);
drivers/gpu/drm/i915/intel_drv.h +3 -3
index 90ba5436370e..4c01decc30d3 100644
@@ -2067,9 +2067,9 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 		      const struct intel_crtc_state *crtc_state);
 void intel_psr_disable(struct intel_dp *intel_dp,
 		      const struct intel_crtc_state *old_crtc_state);
-int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 value);
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state);
+int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
 u64 value);
 void intel_psr_invalidate(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_drv.h +0 -0
 			  unsigned frontbuffer_bits,
 			  enum fb_op_origin origin);
drivers/gpu/drm/i915/intel_psr.c +0 -0
index 84a0fb981561..e970ffd7dd0d 100644
@@ -51,6 +51,8 @@
  * must be correctly synchronized/cancelled when shutting down the

pipe."
*/

drivers/gpu/drm/i915/intel_psr.c +7 -2
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
 
 #include "intel_drv.h"
 #include "i915_drv.h"
@@ -718,8 +720,11 @@ static void intel_psr_enable_locked(struct
 drm_i915_private *dev_priv,
 {
 	struct intel_dp *intel_dp = dev_priv->psr.dp;
 
-	if (dev_priv->psr.enabled)
-		return;
+	WARN_ON(dev_priv->psr.enabled);
+
+	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
+	dev_priv->psr.busy_frontbuffer_bits = 0;
+	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 > pipe;
drivers/gpu/drm/i915/intel_psr.c +3 -2
 	DRM_DEBUG_KMS("Enabling PSR%s\n",
 		      dev_priv->psr.psr2_enabled ? "2" : "1");
@@ -752,20 +757,13 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 	WARN_ON(dev_priv->drrs.dp);
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (dev_priv->psr.prepared) {
-		DRM_DEBUG_KMS("PSR already in use\n");
+
+	if (!psr_global_enabled(dev_priv->psr.debug)) {
+		DRM_DEBUG_KMS("PSR disabled by flag\n");
 		goto unlock;
 	}
 
Quoted 10 lines

drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp, · line 762

Quoted 4 lines
drivers/gpu/drm/i915/intel_psr.c +0 -3
-	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
-	dev_priv->psr.busy_frontbuffer_bits = 0;
-	dev_priv->psr.prepared = true;

Since you are removing .prepared, is there a need for psr_enable/psr_enable_locked separation? Same with disable and disable_locked? The whole thing was added before fastset to avoid modesets.

psr_enable_locked() now will be called from psr_enable() and psr_update() so we can't drop it, the same for psr_disable_locked() it will be called from psr_disable() and psr_update().

Quoted 64 lines
Quoted 48 lines
drivers/gpu/drm/i915/intel_psr.c +1 -6
-	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 > pipe;
-
-	if (psr_global_enabled(dev_priv->psr.debug))
-		intel_psr_enable_locked(dev_priv, crtc_state);
-	else
-		DRM_DEBUG_KMS("PSR disabled by flag\n");
+	intel_psr_enable_locked(dev_priv, crtc_state);

unlock:

drivers/gpu/drm/i915/intel_psr.c +9 -5
 	mutex_unlock(&dev_priv->psr.lock);
@@ -848,18 +846,62 @@ void intel_psr_disable(struct intel_dp
 *intel_dp,
 		return;
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (!dev_priv->psr.prepared) {
-		mutex_unlock(&dev_priv->psr.lock);
-		return;
-	}
 
 	intel_psr_disable_locked(intel_dp);
 
-	dev_priv->psr.prepared = false;
 	mutex_unlock(&dev_priv->psr.lock);
 	cancel_work_sync(&dev_priv->psr.work);
 }
 
+#define PSR_MODE_STRING_GET(enabled, psr2_enabled) \
+		enabled ? (psr2_enabled ? "PSR2" : "PSR1") : "disabled"
+
+/**
+ * intel_psr_update - Update PSR state
+ * @intel_dp: Intel DP
+ * @crtc_state: new CRTC state
+ *
+ * This functions will update PSR states, disabling, enabling or

switching PSR
+ * version when executing fastsets. For full modeset, intel_psr_disable() and
+ * intel_psr_enable() should be called instead.
+ */

drivers/gpu/drm/i915/intel_psr.c +5 -0
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+	struct i915_psr *psr = &dev_priv->psr;

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 882

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +10 -0
+	bool enable, psr2_enable;
+	const char *old_mode, *new_mode;
+
+	if (!CAN_PSR(dev_priv) || READ_ONCE(psr->dp) != intel_dp)
+		return;
+
+	mutex_lock(&dev_priv->psr.lock);
+
+	enable = crtc_state->has_psr && psr_global_enabled(psr->debug);
+	psr2_enable = intel_psr2_enabled(dev_priv, crtc_state);

This gets computed again in psr_enable_locked(). Move the assignment of
dev_priv->psr.psr2_enabled outside of psr_enable_locked() ?

Quoted 2 lines

Looking at the diff, this patch moved it down to psr_enable_locked(), why?

I moved to make psr_enable_locked() be the one resposible to call the necessary functions and change the internal state, otherwise we would have the assignment of dev_priv->psr.psr2_enabled() in intel_psr_enable() and intel_psr_update().
In my opnion call intel_psr2_enabled() it from intel_psr_update() and then in intel_psr_enable_locked() is a very small price that we pay to make code more simple.

Quoted 4 lines

drivers/gpu/drm/i915/intel_psr.c

Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +2 -0
+
+	if (psr->enabled == enable && psr2_enable == psr->psr2_enabled)

nit: keeping the order consistent makes it easy to read IMO

Okay

Quoted 10 lines

if (enable == psr->enabled && psr2_enable == psr->psr2_enabled)

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 889

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +3 -0
+		goto unlock;
+
+	old_mode = PSR_MODE_STRING_GET(psr->enabled, psr-
Quoted 1 line

psr2_enabled);

drivers/gpu/drm/i915/intel_psr.c +2 -0
+	new_mode = PSR_MODE_STRING_GET(enable, psr2_enable);
+	DRM_DEBUG_KMS("Updating from %s to %s", old_mode, new_mode);

Both intel_psr_{enable, disable}_locked() print what's happening, doesn't look like this adds a any new information.

In the logs we have the information that PSR is being disabled but we don't know the version but anyways if you want I can drop this debug message.

Quoted 69 lines
Quoted 69 lines
drivers/gpu/drm/i915/intel_psr.c +42 -10
+
+	if (psr->enabled) {
+		if (!enable || psr2_enable != psr->psr2_enabled)
+			intel_psr_disable_locked(intel_dp);
+	}
+
+	if (enable) {
+		if (!psr->enabled || psr2_enable != psr->psr2_enabled)
+			intel_psr_enable_locked(dev_priv, crtc_state);
+	}
+
+unlock:
+	mutex_unlock(&dev_priv->psr.lock);
+}
+
 /**
  * intel_psr_wait_for_idle - wait for PSR1 to idle
  * @new_crtc_state: new CRTC state
@@ -924,36 +966,63 @@ static bool __psr_wait_for_idle_locked(struct
 drm_i915_private *dev_priv)
 	return err == 0 && dev_priv->psr.enabled;
 }
 
-static bool switching_psr(struct drm_i915_private *dev_priv,
-			  struct intel_crtc_state *crtc_state,
-			  u32 mode)
+static int intel_psr_fastset_force(struct drm_i915_private
 *dev_priv)
 {
-	/* Can't switch psr state anyway if PSR2 is not supported. */
-	if (!crtc_state || !crtc_state->has_psr2)
-		return false;
+	struct drm_device *dev = &dev_priv->drm;
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_atomic_state *state;
+	struct drm_crtc *crtc;
+	int err;
 
-	if (dev_priv->psr.psr2_enabled && mode ==
 I915_PSR_DEBUG_FORCE_PSR1)
-		return true;
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
 
-	if (!dev_priv->psr.psr2_enabled && mode !=
 I915_PSR_DEBUG_FORCE_PSR1)
-		return true;
+	drm_modeset_acquire_init(&ctx,
 DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
+	state->acquire_ctx = &ctx;
+
+retry:
+	drm_for_each_crtc(crtc, dev) {
+		struct drm_crtc_state *crtc_state;
+		struct intel_crtc_state *intel_crtc_state;
+
+		crtc_state = drm_atomic_get_crtc_state(state, crtc);
+		if (IS_ERR(crtc_state)) {
+			err = PTR_ERR(crtc_state);
+			goto error;
+		}
+
+		intel_crtc_state = to_intel_crtc_state(crtc_state);
+
+		if (intel_crtc_has_type(intel_crtc_state,
 INTEL_OUTPUT_EDP)) {
+			/* Mark mode as changed to trigger a pipe-
Quoted 4 lines

drivers/gpu/drm/i915/intel_psr.c static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv) · line 999

Quoted 2 lines
Quoted 1 line

update() */

drivers/gpu/drm/i915/intel_psr.c +1 -0
+			crtc_state->mode_changed = true;

Add a flag to commit only if we found a crtc with eDP output? And perhaps, check for crtc_state->has_psr instead of eDP output?

Huum we could add the crtc_state->has_psr check but maybe there will be a case where it is set to false and a new compute() will set it to false? Anyways there is no down side in not checking it too.

Quoted 91 lines
Quoted 91 lines
drivers/gpu/drm/i915/intel_psr.c +19 -4
+			break;
+		}
+	}
+
+	err = drm_atomic_commit(state);
+
+error:
+	if (err == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		err = drm_modeset_backoff(&ctx);
+		if (!err)
+			goto retry;
+	}
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	drm_atomic_state_put(state);
 
-	return false;
+	return err;
 }
 
-int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 val)
+int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv,

u64 val)
{

drivers/gpu/drm/i915/intel_psr.c +2 -13
-	struct drm_device *dev = &dev_priv->drm;
-	struct drm_connector_state *conn_state;
-	struct intel_crtc_state *crtc_state = NULL;
-	struct drm_crtc_commit *commit;
-	struct drm_crtc *crtc;
-	struct intel_dp *dp;
+	const u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
+	u32 old_mode;
 	int ret;
-	bool enable;
-	u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
 
 	if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) ||
 	    mode > I915_PSR_DEBUG_FORCE_PSR1) {
@@ -961,49 +1030,18 @@ int intel_psr_set_debugfs_mode(struct
 drm_i915_private *dev_priv,
 		return -EINVAL;
 	}
 
-	ret = drm_modeset_lock(&dev->mode_config.connection_mutex,
 ctx);
-	if (ret)
-		return ret;
-
-	/* dev_priv->psr.dp should be set once and then never touched

again. */

drivers/gpu/drm/i915/intel_psr.c +0 -15
-	dp = READ_ONCE(dev_priv->psr.dp);
-	conn_state = dp->attached_connector->base.state;
-	crtc = conn_state->crtc;
-	if (crtc) {
-		ret = drm_modeset_lock(&crtc->mutex, ctx);
-		if (ret)
-			return ret;
-
-		crtc_state = to_intel_crtc_state(crtc->state);
-		commit = crtc_state->base.commit;
-	} else {
-		commit = conn_state->commit;
-	}
-	if (commit) {
-		ret = wait_for_completion_interruptible(&commit-
Quoted 1 line

hw_done);

drivers/gpu/drm/i915/intel_psr.c +1 -11
-		if (ret)
-			return ret;
-	}
-
 	ret = mutex_lock_interruptible(&dev_priv->psr.lock);
 	if (ret)
 		return ret;
 
-	enable = psr_global_enabled(val);
-
-	if (!enable || switching_psr(dev_priv, crtc_state, mode))
-		intel_psr_disable_locked(dev_priv->psr.dp);
-
+	old_mode = dev_priv->psr.debug & I915_PSR_DEBUG_MODE_MASK;
 	dev_priv->psr.debug = val;
-	if (crtc)
-		dev_priv->psr.psr2_enabled =

intel_psr2_enabled(dev_priv, crtc_state);

Quoted 7 lines

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1042

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2 -3
-	intel_psr_irq_control(dev_priv, dev_priv->psr.debug);
+	mutex_unlock(&dev_priv->psr.lock);
 
-	if (dev_priv->psr.prepared && enable)
-		intel_psr_enable_locked(dev_priv, crtc_state);
+	if (old_mode != mode)

What if it was the IRQ debug bit that had changed?

Oh good catch, I probably lost it in some rebase/version, it should be:

+ old_mode = dev_priv->psr.debug & I915_PSR_DEBUG_MODE_MASK;
dev_priv->psr.debug = val;
+ intel_psr_irq_control(dev_priv, dev_priv->psr.debug);

Quoted 7 lines

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1046

Quoted 7 lines
drivers/gpu/drm/i915/intel_psr.c +1 -1
+		ret = intel_psr_fastset_force(dev_priv);
 
-	mutex_unlock(&dev_priv->psr.lock);
 	return ret;
 }

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
Quoted 289 lines · Jose
Quoted 171 lines · Dhinakaran Pandiyan
Quoted 170 lines · José Roberto de Souza

Changing the i915_edp_psr_debug was enabling, disabling or switching
PSR version by directly calling intel_psr_disable_locked() and intel_psr_enable_locked(), what is not the default PSR path that will
be executed by real users.

So lets force a fastset in the PSR CRTC to trigger a pipe update and
stress the default code path.

Recently a bug was found when switching from PSR2 to PSR1 while enable_psr kernel parameter was set to the default parameter, this
changes fix it and also fixes the bug linked bellow were DRRS was left enabled together with PSR when enabling PSR from debugfs.

v2: Handling missing case: disabled to PSR1

v3: Not duplicating the whole atomic state(Maarten)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108341

Cc Maarten Lankhorst <[email protected]>
Cc Dhinakaran Pandiyan <[email protected]>
Cc Rodrigo Vivi <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c |  14 +--
 drivers/gpu/drm/i915/i915_drv.h     |   2 +-
 drivers/gpu/drm/i915/intel_ddi.c    |   2 +-
 drivers/gpu/drm/i915/intel_drv.h    |   6 +-
 drivers/gpu/drm/i915/intel_psr.c    | 188 +++++++++++++++++-----
--
--
--
 5 files changed, 119 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -13
index fa2c226fc779..766a5b4ad3d6 100644
@@ -2607,7 +2607,6 @@ static int
 i915_edp_psr_debug_set(void *data, u64 val)
 {
 	struct drm_i915_private *dev_priv = data;
-	struct drm_modeset_acquire_ctx ctx;
 	intel_wakeref_t wakeref;
 	int ret;
 
@@ -2618,18 +2617,7 @@ i915_edp_psr_debug_set(void *data, u64
 val)
 
 	wakeref = intel_runtime_pm_get(dev_priv);
 
-	drm_modeset_acquire_init(&ctx,
 DRM_MODESET_ACQUIRE_INTERRUPTIBLE);
-
-retry:
-	ret = intel_psr_set_debugfs_mode(dev_priv, &ctx, val);
-	if (ret == -EDEADLK) {
-		ret = drm_modeset_backoff(&ctx);
-		if (!ret)
-			goto retry;
-	}
-
-	drm_modeset_drop_locks(&ctx);
-	drm_modeset_acquire_fini(&ctx);
+	ret = intel_psr_set_debugfs_mode(dev_priv, val);
 
drivers/gpu/drm/i915/i915_debugfs.c +0 -0
 	intel_runtime_pm_put(dev_priv, wakeref);
drivers/gpu/drm/i915/i915_drv.h +1 -1
index f11c66d172d3..baee581a0d5b 100644
@@ -496,7 +496,7 @@ struct i915_psr {
 
 	u32 debug;
 	bool sink_support;
-	bool prepared, enabled;
+	bool enabled;
 	struct intel_dp *dp;
 	enum pipe pipe;
 	bool active;
drivers/gpu/drm/i915/intel_ddi.c +1 -1
index ca705546a0ab..9211e4579489 100644
@@ -3556,7 +3556,7 @@ static void intel_ddi_update_pipe_dp(struct
 intel_encoder *encoder,
 {
 	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
 
-	intel_psr_enable(intel_dp, crtc_state);
+	intel_psr_update(intel_dp, crtc_state);
 	intel_edp_drrs_enable(intel_dp, crtc_state);
 
drivers/gpu/drm/i915/intel_ddi.c +0 -0
 	intel_panel_update_backlight(encoder, crtc_state, conn_state);
drivers/gpu/drm/i915/intel_drv.h +3 -3
index 90ba5436370e..4c01decc30d3 100644
@@ -2067,9 +2067,9 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 		      const struct intel_crtc_state *crtc_state);
 void intel_psr_disable(struct intel_dp *intel_dp,
 		      const struct intel_crtc_state *old_crtc_state);
-int intel_psr_set_debugfs_mode(struct drm_i915_private
 *dev_priv,
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 value);
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state);
+int intel_psr_set_debugfs_mode(struct drm_i915_private
 *dev_priv,

u64 value);
void intel_psr_invalidate(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_drv.h +0 -0
 			  unsigned frontbuffer_bits,
 			  enum fb_op_origin origin);
drivers/gpu/drm/i915/intel_psr.c +0 -0
index 84a0fb981561..e970ffd7dd0d 100644
@@ -51,6 +51,8 @@
  * must be correctly synchronized/cancelled when shutting down

the
pipe."
*/

drivers/gpu/drm/i915/intel_psr.c +7 -2
+#include <drm/drmP.h>
+#include <drm/drm_atomic_helper.h>
 
 #include "intel_drv.h"
 #include "i915_drv.h"
@@ -718,8 +720,11 @@ static void intel_psr_enable_locked(struct
 drm_i915_private *dev_priv,
 {
 	struct intel_dp *intel_dp = dev_priv->psr.dp;
 
-	if (dev_priv->psr.enabled)
-		return;
+	WARN_ON(dev_priv->psr.enabled);
+
+	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
+	dev_priv->psr.busy_frontbuffer_bits = 0;
+	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 > pipe;
drivers/gpu/drm/i915/intel_psr.c +3 -2
 	DRM_DEBUG_KMS("Enabling PSR%s\n",
 		      dev_priv->psr.psr2_enabled ? "2" : "1");
@@ -752,20 +757,13 @@ void intel_psr_enable(struct intel_dp
 *intel_dp,
 	WARN_ON(dev_priv->drrs.dp);
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (dev_priv->psr.prepared) {
-		DRM_DEBUG_KMS("PSR already in use\n");
+
+	if (!psr_global_enabled(dev_priv->psr.debug)) {
+		DRM_DEBUG_KMS("PSR disabled by flag\n");
 		goto unlock;
 	}
 
Quoted 10 lines

drivers/gpu/drm/i915/intel_psr.c void intel_psr_enable(struct intel_dp *intel_dp, · line 762

Quoted 4 lines
drivers/gpu/drm/i915/intel_psr.c +0 -3
-	dev_priv->psr.psr2_enabled = intel_psr2_enabled(dev_priv,
 crtc_state);
-	dev_priv->psr.busy_frontbuffer_bits = 0;
-	dev_priv->psr.prepared = true;

Since you are removing .prepared, is there a need for psr_enable/psr_enable_locked separation? Same with disable and disable_locked? The whole thing was added before fastset to avoid modesets.

psr_enable_locked() now will be called from psr_enable() and psr_update() so we can't drop it, the same for psr_disable_locked() it
will be called from psr_disable() and psr_update().

Quoted 67 lines
Quoted 49 lines
drivers/gpu/drm/i915/intel_psr.c +10 -11
-	dev_priv->psr.pipe = to_intel_crtc(crtc_state->base.crtc)-
 > pipe;
 
-
-	if (psr_global_enabled(dev_priv->psr.debug))
-		intel_psr_enable_locked(dev_priv, crtc_state);
-	else
-		DRM_DEBUG_KMS("PSR disabled by flag\n");
+	intel_psr_enable_locked(dev_priv, crtc_state);
 
 unlock:
 	mutex_unlock(&dev_priv->psr.lock);
@@ -848,18 +846,62 @@ void intel_psr_disable(struct intel_dp
 *intel_dp,
 		return;
 
 	mutex_lock(&dev_priv->psr.lock);
-	if (!dev_priv->psr.prepared) {
-		mutex_unlock(&dev_priv->psr.lock);
-		return;
-	}
 
 	intel_psr_disable_locked(intel_dp);
 
-	dev_priv->psr.prepared = false;
 	mutex_unlock(&dev_priv->psr.lock);
 	cancel_work_sync(&dev_priv->psr.work);
 }
 
+#define PSR_MODE_STRING_GET(enabled, psr2_enabled) \
+		enabled ? (psr2_enabled ? "PSR2" : "PSR1") : "disabled"
+
+/**
+ * intel_psr_update - Update PSR state
+ * @intel_dp: Intel DP
+ * @crtc_state: new CRTC state
+ *
+ * This functions will update PSR states, disabling, enabling or

switching PSR
+ * version when executing fastsets. For full modeset, intel_psr_disable() and
+ * intel_psr_enable() should be called instead.
+ */

drivers/gpu/drm/i915/intel_psr.c +5 -0
+void intel_psr_update(struct intel_dp *intel_dp,
+		      const struct intel_crtc_state *crtc_state)
+{
+	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
+	struct i915_psr *psr = &dev_priv->psr;

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 882

Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +10 -0
+	bool enable, psr2_enable;
+	const char *old_mode, *new_mode;
+
+	if (!CAN_PSR(dev_priv) || READ_ONCE(psr->dp) != intel_dp)
+		return;
+
+	mutex_lock(&dev_priv->psr.lock);
+
+	enable = crtc_state->has_psr && psr_global_enabled(psr->debug);
+	psr2_enable = intel_psr2_enabled(dev_priv, crtc_state);

This gets computed again in psr_enable_locked(). Move the assignment
of
dev_priv->psr.psr2_enabled outside of psr_enable_locked() ?

Quoted 3 lines

Looking at the diff, this patch moved it down to
psr_enable_locked(),
why?

I moved to make psr_enable_locked() be the one resposible to call the necessary functions and change the internal state, otherwise we would have the assignment of dev_priv->psr.psr2_enabled() in intel_psr_enable() and intel_psr_update().
In my opnion call intel_psr2_enabled() it from intel_psr_update() and then in intel_psr_enable_locked() is a very small price that we pay to
make code more simple.

Quoted 5 lines

drivers/gpu/drm/i915/intel_psr.c

Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +2 -0
+
+	if (psr->enabled == enable && psr2_enable == psr->psr2_enabled)

nit: keeping the order consistent makes it easy to read IMO

Okay

Quoted 5 lines

if (enable == psr->enabled && psr2_enable == psr->psr2_enabled)

Quoted 3 lines
drivers/gpu/drm/i915/intel_psr.c +3 -0
+		goto unlock;
+
+	old_mode = PSR_MODE_STRING_GET(psr->enabled, psr-
Quoted 7 lines

drivers/gpu/drm/i915/intel_psr.c void intel_psr_disable(struct intel_dp *intel_dp, · line 889

Quoted 4 lines
Quoted 1 line

psr2_enabled);

drivers/gpu/drm/i915/intel_psr.c +2 -0
+	new_mode = PSR_MODE_STRING_GET(enable, psr2_enable);
+	DRM_DEBUG_KMS("Updating from %s to %s", old_mode, new_mode);

Both intel_psr_{enable, disable}_locked() print what's happening, doesn't look like this adds a any new information.

Quoted 3 lines

In the logs we have the information that PSR is being disabled but we don't know the version but anyways if you want I can drop this debug message.

I see this in psr_disable_locked()

      DRM_DEBUG_KMS("Disabling PSR%s\n",
                      dev_priv->psr.psr2_enabled ? "2" : "1");
Quoted 78 lines
Quoted 71 lines
Quoted 71 lines
drivers/gpu/drm/i915/intel_psr.c +15 -0
+
+	if (psr->enabled) {
+		if (!enable || psr2_enable != psr->psr2_enabled)
+			intel_psr_disable_locked(intel_dp);
+	}
+
+	if (enable) {
+		if (!psr->enabled || psr2_enable != psr->psr2_enabled)
+			intel_psr_enable_locked(dev_priv, crtc_state);
+	}
+
+unlock:
+	mutex_unlock(&dev_priv->psr.lock);
+}
+
 /**
  * intel_psr_wait_for_idle - wait for PSR1 to idle
  * @new_crtc_state: new CRTC state
@@ -924,36 +966,63 @@ static bool

__psr_wait_for_idle_locked(struct
drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_psr.c +1 -3
 	return err == 0 && dev_priv->psr.enabled;
 }
 
-static bool switching_psr(struct drm_i915_private *dev_priv,
-			  struct intel_crtc_state *crtc_state,
-			  u32 mode)
+static int intel_psr_fastset_force(struct drm_i915_private

*dev_priv)
{

drivers/gpu/drm/i915/intel_psr.c +5 -4
-	/* Can't switch psr state anyway if PSR2 is not supported. */
-	if (!crtc_state || !crtc_state->has_psr2)
-		return false;
+	struct drm_device *dev = &dev_priv->drm;
+	struct drm_modeset_acquire_ctx ctx;
+	struct drm_atomic_state *state;
+	struct drm_crtc *crtc;
+	int err;
 
-	if (dev_priv->psr.psr2_enabled && mode ==

I915_PSR_DEBUG_FORCE_PSR1)

drivers/gpu/drm/i915/intel_psr.c +3 -2
-		return true;
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
 
-	if (!dev_priv->psr.psr2_enabled && mode !=

I915_PSR_DEBUG_FORCE_PSR1)

drivers/gpu/drm/i915/intel_psr.c +1 -1
-		return true;
+	drm_modeset_acquire_init(&ctx,

DRM_MODESET_ACQUIRE_INTERRUPTIBLE);

drivers/gpu/drm/i915/intel_psr.c +16 -0
+	state->acquire_ctx = &ctx;
+
+retry:
+	drm_for_each_crtc(crtc, dev) {
+		struct drm_crtc_state *crtc_state;
+		struct intel_crtc_state *intel_crtc_state;
+
+		crtc_state = drm_atomic_get_crtc_state(state, crtc);
+		if (IS_ERR(crtc_state)) {
+			err = PTR_ERR(crtc_state);
+			goto error;
+		}
+
+		intel_crtc_state = to_intel_crtc_state(crtc_state);
+
+		if (intel_crtc_has_type(intel_crtc_state,

INTEL_OUTPUT_EDP)) {

drivers/gpu/drm/i915/intel_psr.c +1 -0
+			/* Mark mode as changed to trigger a pipe-
Quoted 6 lines

drivers/gpu/drm/i915/intel_psr.c static bool __psr_wait_for_idle_locked(struct drm_i915_private *dev_priv) · line 999

Quoted 3 lines
Quoted 1 line

update() */

drivers/gpu/drm/i915/intel_psr.c +1 -0
+			crtc_state->mode_changed = true;

Add a flag to commit only if we found a crtc with eDP output? And perhaps, check for crtc_state->has_psr instead of eDP output?

Quoted 4 lines

Huum we could add the crtc_state->has_psr check but maybe there will be
a case where it is set to false and a new compute() will set it to false?

I can't think of a case, and whatever is responsible for changing crtc_state->has_psr would be doing a separate modeset iiuc

Quoted 113 lines

Anyways there is no down side in not checking it too.

Quoted 94 lines
Quoted 94 lines
drivers/gpu/drm/i915/intel_psr.c +18 -2
+			break;
+		}
+	}
+
+	err = drm_atomic_commit(state);
+
+error:
+	if (err == -EDEADLK) {
+		drm_atomic_state_clear(state);
+		err = drm_modeset_backoff(&ctx);
+		if (!err)
+			goto retry;
+	}
+
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	drm_atomic_state_put(state);
 
-	return false;
+	return err;
 }
 
-int intel_psr_set_debugfs_mode(struct drm_i915_private

*dev_priv,

drivers/gpu/drm/i915/intel_psr.c +1 -2
-			       struct drm_modeset_acquire_ctx *ctx,
-			       u64 val)
+int intel_psr_set_debugfs_mode(struct drm_i915_private

*dev_priv,
u64 val)
{

drivers/gpu/drm/i915/intel_psr.c +2 -13
-	struct drm_device *dev = &dev_priv->drm;
-	struct drm_connector_state *conn_state;
-	struct intel_crtc_state *crtc_state = NULL;
-	struct drm_crtc_commit *commit;
-	struct drm_crtc *crtc;
-	struct intel_dp *dp;
+	const u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
+	u32 old_mode;
 	int ret;
-	bool enable;
-	u32 mode = val & I915_PSR_DEBUG_MODE_MASK;
 
 	if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) ||
 	    mode > I915_PSR_DEBUG_FORCE_PSR1) {
@@ -961,49 +1030,18 @@ int intel_psr_set_debugfs_mode(struct
 drm_i915_private *dev_priv,
 		return -EINVAL;
 	}
 
-	ret = drm_modeset_lock(&dev->mode_config.connection_mutex,
 ctx);
-	if (ret)
-		return ret;
-
-	/* dev_priv->psr.dp should be set once and then never touched

again. */

drivers/gpu/drm/i915/intel_psr.c +0 -15
-	dp = READ_ONCE(dev_priv->psr.dp);
-	conn_state = dp->attached_connector->base.state;
-	crtc = conn_state->crtc;
-	if (crtc) {
-		ret = drm_modeset_lock(&crtc->mutex, ctx);
-		if (ret)
-			return ret;
-
-		crtc_state = to_intel_crtc_state(crtc->state);
-		commit = crtc_state->base.commit;
-	} else {
-		commit = conn_state->commit;
-	}
-	if (commit) {
-		ret = wait_for_completion_interruptible(&commit-
Quoted 1 line

hw_done);

drivers/gpu/drm/i915/intel_psr.c +1 -11
-		if (ret)
-			return ret;
-	}
-
 	ret = mutex_lock_interruptible(&dev_priv->psr.lock);
 	if (ret)
 		return ret;
 
-	enable = psr_global_enabled(val);
-
-	if (!enable || switching_psr(dev_priv, crtc_state, mode))
-		intel_psr_disable_locked(dev_priv->psr.dp);
-
+	old_mode = dev_priv->psr.debug & I915_PSR_DEBUG_MODE_MASK;
 	dev_priv->psr.debug = val;
-	if (crtc)
-		dev_priv->psr.psr2_enabled =

intel_psr2_enabled(dev_priv, crtc_state);

Quoted 8 lines

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1042

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +2 -3
-	intel_psr_irq_control(dev_priv, dev_priv->psr.debug);
+	mutex_unlock(&dev_priv->psr.lock);
 
-	if (dev_priv->psr.prepared && enable)
-		intel_psr_enable_locked(dev_priv, crtc_state);
+	if (old_mode != mode)

What if it was the IRQ debug bit that had changed?

Oh good catch, I probably lost it in some rebase/version, it should be:

drivers/gpu/drm/i915/intel_psr.c +2 -0
+	old_mode = dev_priv->psr.debug & I915_PSR_DEBUG_MODE_MASK;
  	dev_priv->psr.debug = val;
+	intel_psr_irq_control(dev_priv, dev_priv->psr.debug);
Quoted 2 lines
Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/i915/intel_psr.c int intel_psr_set_debugfs_mode(struct drm_i915_private *dev_priv, · line 1046

Quoted 6 lines
drivers/gpu/drm/i915/intel_psr.c +1 -1
+		ret = intel_psr_fastset_force(dev_priv);
 
-	mutex_unlock(&dev_priv->psr.lock);
 	return ret;
 }

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx