Skip to contentSkip to conversation

drm/i915/debugfs: Print sink PSR status

PATCH In review José Roberto de Souza 4 participants 10 messages Apr 2, 2018 – Apr 9, 2018

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

PATCH v2 1/2 drm/i915/debugfs: Print sink PSR status

IGT tests could be improved with sink status, knowing for sure that hardware have activate or exit PSR.

---
 drivers/gpu/drm/i915/i915_debugfs.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +29 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device timings",
+		"transition to inactive, capture and display, timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+
 static int i915_edp_psr_status(struct seq_file *m, void *data)
 {
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux;
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val) == 1)
+			seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val,
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
 
 	intel_runtime_pm_put(dev_priv);
Signature · 6 lines
2.16.3

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

PATCH v2 2/2 drm/i915/psr/cnl: Set y-coordinate as valid in SDP

This was my bad, spec says that the name of this bit is 'Y-coordinate valid' but the values for it is:
0: Include Y-coordinate valid eDP1.4a
1: Do not include Y-coordinate valid eDP 1.4 So not setting it.

---

Changelog:
v2: Not renaming EDP_Y_COORDINATE_VALID

 drivers/gpu/drm/i915/intel_psr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +2 -3
index 2d53f7398a6d..f12111438bcf 100644
@@ -400,9 +400,8 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)
 	 * mesh at all with our frontbuffer tracking. And the hw alone isn't
 	 * good enough. */
 	val |= EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE;
-	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
-		val |= EDP_Y_COORDINATE_VALID | EDP_Y_COORDINATE_ENABLE;
-	}
+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+		val |= EDP_Y_COORDINATE_ENABLE;
 
 	val |= EDP_PSR2_FRAME_BEFORE_SU(dev_priv->psr.sink_sync_latency + 1);
 
Signature · 6 lines
2.16.3

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

✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915/debugfs: Print sink PSR status

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

== Series Details ==

Series: series starting with [v2,1/2] drm/i915/debugfs: Print sink PSR status
URL : https://patchwork.freedesktop.org/series/41022/
State : success

== Summary ==

Series 41022v1 series starting with [v2,1/2] drm/i915/debugfs: Print sink PSR status
https://patchwork.freedesktop.org/api/1.0/series/41022/revisions/1/mbox/

fi-bdw-5557u     total:285  pass:264  dwarn:0   dfail:0   fail:0   skip:21  time:432s
fi-bdw-gvtdvm    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:441s
fi-blb-e6850     total:285  pass:220  dwarn:1   dfail:0   fail:0   skip:64  time:378s
fi-bsw-n3050     total:285  pass:239  dwarn:0   dfail:0   fail:0   skip:46  time:541s
fi-bwr-2160      total:285  pass:180  dwarn:0   dfail:0   fail:0   skip:105 time:296s
fi-bxt-dsi       total:285  pass:255  dwarn:0   dfail:0   fail:0   skip:30  time:512s
fi-bxt-j4205     total:285  pass:256  dwarn:0   dfail:0   fail:0   skip:29  time:518s
fi-byt-j1900     total:285  pass:250  dwarn:0   dfail:0   fail:0   skip:35  time:521s
fi-byt-n2820     total:285  pass:246  dwarn:0   dfail:0   fail:0   skip:39  time:509s
fi-cfl-8700k     total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:409s
fi-cfl-s3        total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:561s
fi-cfl-u         total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:510s
fi-cnl-y3        total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:577s
fi-elk-e7500     total:285  pass:225  dwarn:1   dfail:0   fail:0   skip:59  time:422s
fi-gdg-551       total:285  pass:176  dwarn:0   dfail:0   fail:1   skip:108 time:320s
fi-glk-1         total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:535s
fi-hsw-4770      total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:402s
fi-ilk-650       total:285  pass:225  dwarn:0   dfail:0   fail:0   skip:60  time:419s
fi-ivb-3520m     total:285  pass:256  dwarn:0   dfail:0   fail:0   skip:29  time:467s
fi-ivb-3770      total:285  pass:252  dwarn:0   dfail:0   fail:0   skip:33  time:432s
fi-kbl-7500u     total:285  pass:260  dwarn:1   dfail:0   fail:0   skip:24  time:470s
fi-kbl-7567u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:462s
fi-kbl-r         total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:506s
fi-pnv-d510      total:285  pass:219  dwarn:1   dfail:0   fail:0   skip:65  time:670s
fi-skl-6260u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:443s
fi-skl-6600u     total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:534s
fi-skl-6700k2    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:502s
fi-skl-6770hq    total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:513s
fi-skl-guc       total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:430s
fi-skl-gvtdvm    total:285  pass:262  dwarn:0   dfail:0   fail:0   skip:23  time:443s
fi-snb-2520m     total:285  pass:245  dwarn:0   dfail:0   fail:0   skip:40  time:597s
fi-snb-2600      total:285  pass:245  dwarn:0   dfail:0   fail:0   skip:40  time:397s
Blacklisted hosts:
fi-cnl-psr       total:285  pass:255  dwarn:3   dfail:0   fail:1   skip:26  time:527s
fi-glk-j4005     total:285  pass:256  dwarn:0   dfail:0   fail:0   skip:29  time:485s

c46052cde6a50c5459e00791ffc4d5aa1ec58a9e drm-tip: 2018y-03m-30d-18h-56m-26s UTC integration manifest 4c3d5eaa3722 drm/i915/psr/cnl: Set y-coordinate as valid in SDP
b029e056dae9 drm/i915/debugfs: Print sink PSR status

== Logs ==

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

#3 lore raw

✗ Fi.CI.IGT: warning for series starting with [v2,1/2] drm/i915/debugfs: Print sink PSR status

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

== Series Details ==

Series: series starting with [v2,1/2] drm/i915/debugfs: Print sink PSR status
URL : https://patchwork.freedesktop.org/series/41022/
State : warning

== Summary ==

---- Possible new issues:

Test kms_chv_cursor_fail:

        Subgroup pipe-b-64x64-top-edge:
                pass       -> SKIP       (shard-snb)
Test kms_cursor_crc:
        Subgroup cursor-64x64-suspend:
                dmesg-warn -> PASS       (shard-snb)

---- Known issues:

Test gem_softpin:

        Subgroup noreloc-s3:
                incomplete -> PASS       (shard-hsw) fdo#103540
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-primscrn-shrfb-msflip-blt:
                dmesg-fail -> PASS       (shard-apl) fdo#104727
Test kms_plane:
        Subgroup plane-panning-bottom-right-suspend-pipe-c-planes:
                pass       -> INCOMPLETE (shard-hsw) fdo#103375

fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#104727 https://bugs.freedesktop.org/show_bug.cgi?id=104727
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375

shard-apl        total:3495 pass:1831 dwarn:1   dfail:0   fail:7   skip:1655 time:12912s
shard-hsw        total:3493 pass:1780 dwarn:1   dfail:0   fail:1   skip:1709 time:10871s
shard-snb        total:3495 pass:1373 dwarn:1   dfail:0   fail:3   skip:2118 time:6990s

Blacklisted hosts:
shard-kbl total:3495 pass:1958 dwarn:1 dfail:1 fail:7 skip:1528 time:9294s

== Logs ==

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

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

IGT tests could be improved with sink status, knowing for sure that hardware have activate or exit PSR.

Please don't merge this patch yet. While the patch itself is correct, testing it brings up an interesting problem.

Printing the sink_status() leads to power_get(aux_domain) which wakes up the display engine from DC5/6. This results in a HW triggered PSR exit, effectively altering the state that we are trying to read. I would like to understand the problem fully before merging the patch.

Quoted 43 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +22 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device timings",
+		"transition to inactive, capture and display, timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+
 static int i915_edp_psr_status(struct seq_file *m, void *data)
 {
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {

drivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file *m, void *data) · line 2718

Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +7 -0
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux;
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val) == 1)
+			seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val,
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
 
 	intel_runtime_pm_put(dev_priv);

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

maintainer
#5 lore raw
Quoted 7 lines · Dhinakaran
Quoted 4 lines · José Roberto de Souza

IGT tests could be improved with sink status, knowing for sure that hardware have activate or exit PSR.

Quoted 7 lines

Please don't merge this patch yet. While the patch itself is correct, testing it brings up an interesting problem.

Printing the sink_status() leads to power_get(aux_domain) which wakes up the display engine from DC5/6. This results in a HW triggered PSR exit, effectively altering the state that we are trying to read. I would like to understand the problem fully before merging the patch.

ack

Quoted 54 lines
Quoted 54 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +29 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device timings",
+		"transition to inactive, capture and display, timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+
 static int i915_edp_psr_status(struct seq_file *m, void *data)
 {
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux;
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val) == 1)
+			seq_printf(m, "Sink PSR status: 0x%x [%s]\n", val,
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
 
Quoted 1 line

drivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file *m, void *data) · line 2718

Quoted 1 line
drivers/gpu/drm/i915/i915_debugfs.c +0 -0
 	intel_runtime_pm_put(dev_priv);

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

#6 lore raw
In reply to Pandiyan, Dhinakaran
Quoted 10 lines · Dhinakaran
Quoted 4 lines · José Roberto de Souza

IGT tests could be improved with sink status, knowing for sure that hardware have activate or exit PSR.

Please don't merge this patch yet. While the patch itself is correct, testing it brings up an interesting problem.

Quoted 7 lines

Printing the sink_status() leads to power_get(aux_domain) which wakes up
the display engine from DC5/6. This results in a HW triggered PSR exit,
effectively altering the state that we are trying to read. I would like
to understand the problem fully before merging the patch.

In my tests(PSR1 only) with DMC loaded, I can see HW trigerring PSR exit when reading i915_edp_psr_status with or without this patch, the event that caused is 'SRD Mask Reg Write'.
After masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE in EDP_PSR_DEBUG it do not happens with or without this patch.

Masking this event did not bring more IGT errors than we have now, what do you think Dhinakaran? Should we mask it?

Quoted 63 lines
Quoted 63 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29
+++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +20 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device
 timings",
+		"transition to inactive, capture and display,
 timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+
 static int i915_edp_psr_status(struct seq_file *m, void *data)

{
struct drm_i915_private *dev_priv = node_to_i915(m-

Quoted 1 line

private);

drivers/gpu/drm/i915/i915_debugfs.c +7 -0
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct
 seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled-
 >aux;
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val) ==
 1)
+			seq_printf(m, "Sink PSR status: 0x%x

[%s]\n", val,

drivers/gpu/drm/i915/i915_debugfs.c +2 -0
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
Quoted 1 line
Quoted 1 line

intel_runtime_pm_put(dev_priv);

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

#7 lore raw
Quoted 29 lines · José Roberto de Souza
Quoted 12 lines · Dhinakaran
Quoted 5 lines · José Roberto de Souza

IGT tests could be improved with sink status, knowing for sure that
hardware have activate or exit PSR.

Please don't merge this patch yet. While the patch itself is correct,
testing it brings up an interesting problem.

Quoted 8 lines

Printing the sink_status() leads to power_get(aux_domain) which wakes
up
the display engine from DC5/6. This results in a HW triggered PSR exit,
effectively altering the state that we are trying to read. I would like
to understand the problem fully before merging the patch.

In my tests(PSR1 only) with DMC loaded, I can see HW trigerring PSR exit when reading i915_edp_psr_status with or without this patch, the event that caused is 'SRD Mask Reg Write'.
After masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE in EDP_PSR_DEBUG it do
not happens with or without this patch.

Quoted 3 lines

Masking this event did not bring more IGT errors than we have now, what
do you think Dhinakaran? Should we mask it?

Another information missed:

When doing a dpcd(I did not look at what exacly is causing it) transaction it is causing the HW to be awaken from DC6 with or without masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE but when masking it do not cause a PSR exit.
Reading i915_sr_status also cause HW to be awaken from DC6.

Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29
+++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +20 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32
 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device
 timings",
+		"transition to inactive, capture and display,
 timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+

static int i915_edp_psr_status(struct seq_file *m, void *data) {
struct drm_i915_private *dev_priv = node_to_i915(m-

Quoted 1 line

private);

drivers/gpu/drm/i915/i915_debugfs.c +6 -0
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct
 seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled-
 > aux;
 
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val)

==
1)

drivers/gpu/drm/i915/i915_debugfs.c +1 -0
+			seq_printf(m, "Sink PSR status: 0x%x

[%s]\n", val,

drivers/gpu/drm/i915/i915_debugfs.c +2 -0
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
Quoted 1 line
Quoted 1 line
Quoted 1 line

intel_runtime_pm_put(dev_priv);

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

#8 lore raw
Quoted 23 lines · Jose
Quoted 22 lines · José Roberto de Souza
Quoted 20 lines · Dhinakaran
Quoted 5 lines · José Roberto de Souza

IGT tests could be improved with sink status, knowing for sure that
hardware have activate or exit PSR.

Please don't merge this patch yet. While the patch itself is correct,
testing it brings up an interesting problem.

Printing the sink_status() leads to power_get(aux_domain) which wakes
up
the display engine from DC5/6. This results in a HW triggered PSR exit,
effectively altering the state that we are trying to read. I would like
to understand the problem fully before merging the patch.

Quoted 7 lines
Quoted 7 lines

In my tests(PSR1 only) with DMC loaded, I can see HW trigerring PSR exit when reading i915_edp_psr_status with or without this patch, the event that caused is 'SRD Mask Reg Write'.
After masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE in EDP_PSR_DEBUG it do
not happens with or without this patch.

Reads causing PSR exit is a concern, but I have seen edp_psr_status showing PSR live status as active. If reads triggered exit, then it should always be inactive. Unless the exit happens after the status is read.

Quoted 4 lines
Quoted 3 lines

Masking this event did not bring more IGT errors than we have now, what
do you think Dhinakaran? Should we mask it?

We'll need PSR to exit on some register writes, example flips or cursor moves.

Quoted 5 lines

Another information missed:

When doing a dpcd(I did not look at what exacly is causing it) transaction it is causing the HW to be awaken from DC6 with or without masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE

This is expected, AUX_A is in the DC_OFF power domain, so the driver forces a DC6 exit.

Quoted 4 lines

but when masking it do not
cause a PSR exit.
Reading i915_sr_status also cause HW to be awaken from DC6.

What hardware are you testing on? And is this a PSR2 panel?

Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
Quoted 68 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29
+++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +20 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char *psr2_live_status(u32
 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device
 timings",
+		"transition to inactive, capture and display,
 timing re-sync",
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+

static int i915_edp_psr_status(struct seq_file *m, void *data) {
struct drm_i915_private *dev_priv = node_to_i915(m-

Quoted 1 line

private);

drivers/gpu/drm/i915/i915_debugfs.c +6 -0
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct
 seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv->psr.enabled-
 > aux;
 
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS, &val)

==
1)

drivers/gpu/drm/i915/i915_debugfs.c +1 -0
+			seq_printf(m, "Sink PSR status: 0x%x

[%s]\n", val,

drivers/gpu/drm/i915/i915_debugfs.c +2 -0
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

intel_runtime_pm_put(dev_priv);

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

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

#9 lore raw
Quoted 41 lines · Dhinakaran Pandiyan
Quoted 27 lines · Jose
Quoted 26 lines · José Roberto de Souza
Quoted 24 lines · Dhinakaran
Quoted 7 lines · José Roberto de Souza

IGT tests could be improved with sink status, knowing for sure
that
hardware have activate or exit PSR.

om>

Please don't merge this patch yet. While the patch itself is correct,
testing it brings up an interesting problem.

Printing the sink_status() leads to power_get(aux_domain) which wakes
up
the display engine from DC5/6. This results in a HW triggered PSR
exit,
effectively altering the state that we are trying to read. I would
like
to understand the problem fully before merging the patch.

Quoted 10 lines
Quoted 10 lines

In my tests(PSR1 only) with DMC loaded, I can see HW trigerring PSR
exit when reading i915_edp_psr_status with or without this patch, the
event that caused is 'SRD Mask Reg Write'.
After masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE in EDP_PSR_DEBUG it
do
not happens with or without this patch.

Quoted 5 lines

Reads causing PSR exit is a concern, but I have seen edp_psr_status showing PSR live status as active. If reads triggered exit, then it should always be inactive. Unless the exit happens after the status is
read.

Same thing for sink status, I can see that PSR is exiting but the status is still active on sink.

Quoted 9 lines
Quoted 5 lines
Quoted 5 lines

Masking this event did not bring more IGT errors than we have now,
what
do you think Dhinakaran? Should we mask it?

We'll need PSR to exit on some register writes, example flips or cursor
moves.

PIPE related writes are still causing PSR to exit, PSR_EVENT have a bit for Register Update and other for Pipe Registers Update but it don't have a counter part in PSR_MASK/SRD_DEBUG to make the pipe register updated not trigger a PSR exit.

Quoted 11 lines
Quoted 7 lines

Another information missed:

When doing a dpcd(I did not look at what exacly is causing it) transaction it is causing the HW to be awaken from DC6 with or without
masking EDP_PSR_DEBUG_MASK_DISP_REG_WRITE

This is expected, AUX_A is in the DC_OFF power domain, so the driver forces a DC6 exit.

Quoted 6 lines
Quoted 4 lines

but when masking it do not
cause a PSR exit.
Reading i915_sr_status also cause HW to be awaken from DC6.

What hardware are you testing on? And is this a PSR2 panel?

KBL it is a PSR2 pannels but I did some changes to only enable PSR1.

Quoted 76 lines
Quoted 76 lines
Quoted 76 lines
Quoted 76 lines
Quoted 76 lines
---
 drivers/gpu/drm/i915/i915_debugfs.c | 29
+++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +8 -0
index 1dba2c451255..c9ac946b62c9 100644
@@ -2603,6 +2603,26 @@ static const char
 *psr2_live_status(u32
 val)
 	return "unknown";
 }
 
+static const char *psr_sink_status(u8 val)
+{
+	static const char * const sink_status[] = {
+		"inactive",
+		"transition to active, capture and display",
+		"active, display from RFB",
+		"active, capture and display on sink device
 timings",
+		"transition to inactive, capture and

display,
timing re-sync",

drivers/gpu/drm/i915/i915_debugfs.c +12 -0
+		"reserved",
+		"reserved",
+		"sink internal error"
+	};
+
+	val &= DP_PSR_SINK_STATE_MASK;
+	if (val < ARRAY_SIZE(sink_status))
+		return sink_status[val];
+
+	return "unknown";
+}
+
 static int i915_edp_psr_status(struct seq_file *m, void

*data)
{
struct drm_i915_private *dev_priv = node_to_i915(m-

Quoted 1 line

private);

drivers/gpu/drm/i915/i915_debugfs.c +3 -0
@@ -2684,6 +2704,15 @@ static int i915_edp_psr_status(struct
 seq_file *m, void *data)
 		seq_printf(m, "EDP_PSR2_STATUS: %x [%s]\n",
 			   psr2, psr2_live_status(psr2));
 	}
+
+	if (dev_priv->psr.enabled) {
+		struct drm_dp_aux *aux = &dev_priv-
Quoted 2 lines

psr.enabled-
aux;

drivers/gpu/drm/i915/i915_debugfs.c +3 -0
+		u8 val;
+
+		if (drm_dp_dpcd_readb(aux, DP_PSR_STATUS,

&val)
==
1)

drivers/gpu/drm/i915/i915_debugfs.c +1 -0
+			seq_printf(m, "Sink PSR status: 0x%x

[%s]\n", val,

drivers/gpu/drm/i915/i915_debugfs.c +2 -0
+				   psr_sink_status(val));
+	}
 	mutex_unlock(&dev_priv->psr.lock);
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

intel_runtime_pm_put(dev_priv);

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

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