drm/i915/psr : Add psr1 live status
Subsystems (2)
PATCH 1/1 drm/i915/psr : Add psr1 live status
From: Vathsala Nagaraju <[email protected]>
Prints live state of psr1.Extending the existing
PSR2 live state function to cover psr1.
Tested on KBL with psr2 and psr1 panel.
v2: rebase
v3: DK
Rename psr2_live_status to psr_source_status.
v4: DK
Move EDP_PSR_STATUS_STATE_SHIFT below EDP_PSR_STATUS_STATE_MASK. Pass seq to psr_source_status, handle source status prints in psr_source_status.
v5: Fixed CI warning messages
--- drivers/gpu/drm/i915/i915_debugfs.c | 72 ++++++++++++++++++++++++------------- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 49 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +48 -24
@@ -2596,27 +2596,55 @@ static int i915_guc_log_relay_release(struct inode *inode, struct file *file) .release = i915_guc_log_relay_release, }; -static const char *psr2_live_status (u32 val) -{ -static const char *const live_status[] = { -"IDLE" , -"CAPTURE" , -"CAPTURE_FS" , -"SLEEP" , -"BUFON_FW" , -"ML_UP" , -"SU_STANDBY" , -"FAST_SLEEP" , -"DEEP_SLEEP" , -"BUF_ON" , -"TG_ON" - }; +static void +psr_source_status (struct drm_i915_private *dev_priv,struct seq_file *m) +{ +u32 val, psr_status =0 ; - val = (val &EDP_PSR2_STATUS_STATE_MASK ) >>EDP_PSR2_STATUS_STATE_SHIFT ; -if (val <ARRAY_SIZE (live_status)) -return live_status[val]; +if (dev_priv->psr.psr2_enabled) { +static const char *const live_status[] = { +"IDLE" , +"CAPTURE" , +"CAPTURE_FS" , +"SLEEP" , +"BUFON_FW" , +"ML_UP" , +"SU_STANDBY" , +"FAST_SLEEP" , +"DEEP_SLEEP" , +"BUF_ON" , +"TG_ON" + }; + psr_status =I915_READ (EDP_PSR2_STATUS ); + val = (psr_status &EDP_PSR2_STATUS_STATE_MASK ) >> +EDP_PSR2_STATUS_STATE_SHIFT ; +if (val <ARRAY_SIZE (live_status)) { +seq_printf (m,"Source PSR status: %x[%s]\n" , psr_status, + live_status[val]); +return ; + } + }else { +static const char *const live_status[] = { +"IDLE" , +"SRDONACK" , +"SRDENT" , +"BUFOFF" , +"BUFON" , +"AUXACK" , +"SRDOFFACK" , +"SRDENT_ON" , + }; + psr_status =I915_READ (EDP_PSR_STATUS ); + val = (psr_status &EDP_PSR_STATUS_STATE_MASK ) >> +EDP_PSR_STATUS_STATE_SHIFT ; +if (val <ARRAY_SIZE (live_status)) { +seq_printf (m,"Source PSR status: %x[%s]\n" , psr_status, + live_status[val]); +return ; + } + } -return "unknown" ; +seq_printf (m,"Source psr status: %x[%s]\n" , psr_status,"unknown" ); }static const char *psr_sink_status (u8 val)
@@ -2714,12 +2742,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Performance_Counter: %u\n" , psrperf); } -if (dev_priv->psr.psr2_enabled) { -u32 psr2 =I915_READ (EDP_PSR2_STATUS ); -seq_printf (m,"EDP_PSR2_STATUS: %x [%s]\n" , - psr2,psr2_live_status (psr2)); - } +psr_source_status (dev_priv, m);if (dev_priv->psr.enabled) {struct drm_dp_aux *aux = &dev_priv->psr.enabled->aux;
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4048,6 +4048,7 @@ enum {#define EDP_PSR_STATUS _MMIO(dev_priv->psr_mmio_base + 0x40)#define EDP_PSR_STATUS_STATE_MASK (7<<29) +#define EDP_PSR_STATUS_STATE_SHIFT 29#define EDP_PSR_STATUS_STATE_IDLE (0<<29)#define EDP_PSR_STATUS_STATE_SRDONACK (1<<29)#define EDP_PSR_STATUS_STATE_SRDENT (2<<29)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr : Add psr1 live status (rev5)
== Series Details ==
== Series Details ==
Series: drm/i915/psr : Add psr1 live status (rev5)
URL : https://patchwork.freedesktop.org/series/42021/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4237 -> Patchwork_9115 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42021/revisions/5/mbox/
== Known issues ==
Here are the changes found in Patchwork_9115 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: PASS -> FAIL (fdo#102575)
igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
fi-skl-6700k2: PASS -> FAIL (fdo#104724, fdo#103191) fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
== Participating hosts (44 -> 39) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4237 -> Patchwork_9115
CI_DRM_4237: 7e428318149fae612783841e39d25b5e8a000171 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4498: f9ecb79ad8b02278cfdb5b82495df47061c04f8f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9115: f577e17e164f82bf6654f191efad5ef9a1d28379 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f577e17e164f drm/i915/psr : Add psr1 live status
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9115/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/psr : Add psr1 live status (rev5)
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: drm/i915/psr : Add psr1 live status (rev5)
URL : https://patchwork.freedesktop.org/series/42021/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4237_full -> Patchwork_9115_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9115_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9115_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42021/revisions/5/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9115_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-vebox:
shard-kbl: SKIP -> PASS +1
igt@gem_mocs_settings@mocs-rc6-blt:
shard-kbl: PASS -> SKIP +1== Known issues ==
Here are the changes found in Patchwork_9115_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-apl: PASS -> FAIL (fdo#104724, fdo#103232, fdo#103191, fdo#104645)
igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
shard-hsw: PASS -> FAIL (fdo#104873)
igt@perf@polling:
shard-hsw: PASS -> FAIL (fdo#102252)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-apl: INCOMPLETE (fdo#103927) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip@plain-flip-fb-recreate:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: FAIL (fdo#104724) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
shard-kbl: FAIL (fdo#99912) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104645 https://bugs.freedesktop.org/show_bug.cgi?id=104645
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4237 -> Patchwork_9115
CI_DRM_4237: 7e428318149fae612783841e39d25b5e8a000171 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4498: f9ecb79ad8b02278cfdb5b82495df47061c04f8f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9115: f577e17e164f82bf6654f191efad5ef9a1d28379 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9115/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · vathsala nagaraju
From: Vathsala Nagaraju <[email protected]>
Prints live state of psr1.Extending the existing
PSR2 live state function to cover psr1.Tested on KBL with psr2 and psr1 panel.
v2: rebase
v3: DK
Renamepsr2_live_statustopsr_source_status.
v4: DK
MoveEDP_PSR_STATUS_STATE_SHIFTbelowEDP_PSR_STATUS_STATE_MASK. Pass seq topsr_source_status, handle source status prints inpsr_source_status.
v5: Fixed CI warning messages
Quoted 3 lines
Cc Rodrigo Vivi <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>
nit: Noticed an extra space in the title before the colon.
Quoted 69 lines
Signed-off-by Vathsala Nagaraju <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 72 ++++++++++++++++++++++++---
----------
drivers/gpu/drm/i915/i915_reg.h | 1 +2 files changed, 49 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2596,27 +2596,55 @@ static int i915_guc_log_relay_release(struct inode *inode, struct file *file) .release = i915_guc_log_relay_release, };drivers/gpu/drm/i915/i915_debugfs.c +2
-15-static const char *psr2_live_status (u32 val) -{ -static const char *const live_status[] = { -"IDLE" , -"CAPTURE" , -"CAPTURE_FS" , -"SLEEP" , -"BUFON_FW" , -"ML_UP" , -"SU_STANDBY" , -"FAST_SLEEP" , -"DEEP_SLEEP" , -"BUF_ON" , -"TG_ON" - }; +static void +psr_source_status(struct drm_i915_private *dev_priv, struct seq_file*m)
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+{ +u32 val, psr_status =0 ;drivers/gpu/drm/i915/i915_debugfs.c +0
-1- val = (val & EDP_PSR2_STATUS_STATE_MASK) >>
EDP_PSR2_STATUS_STATE_SHIFT;drivers/gpu/drm/i915/i915_debugfs.c +19
-2-if (val <ARRAY_SIZE (live_status)) -return live_status[val]; +if (dev_priv->psr.psr2_enabled) { +static const char *const live_status[] = { +"IDLE" , +"CAPTURE" , +"CAPTURE_FS" , +"SLEEP" , +"BUFON_FW" , +"ML_UP" , +"SU_STANDBY" , +"FAST_SLEEP" , +"DEEP_SLEEP" , +"BUF_ON" , +"TG_ON" + }; + psr_status =I915_READ (EDP_PSR2_STATUS ); + val = (psr_status & EDP_PSR2_STATUS_STATE_MASK) >> +EDP_PSR2_STATUS_STATE_SHIFT ; +if (val <ARRAY_SIZE (live_status)) { + seq_printf(m, "Source PSR status: %x[%s]\n",
psr_status,drivers/gpu/drm/i915/i915_debugfs.c +7
-0+ live_status[val]); +return ; + } + }else { +static const char *const live_status[] = { +"IDLE" , + "SRDONACK",
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_log_relay_release(struct inode *inode, struct file *file) · line 2639
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+"SRDENT" , +"BUFOFF" , +"BUFON" , +"AUXACK" , +"SRDOFFACK" , +"SRDENT_ON" , + }; + psr_status =I915_READ (EDP_PSR_STATUS ); + val = (psr_status &EDP_PSR_STATUS_STATE_MASK ) >> +EDP_PSR_STATUS_STATE_SHIFT ;
^alignment is different from the PSR2 block.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 17 lines · Dhinakaran Pandiyan
Quoted 16 lines · vathsala nagaraju
From: Vathsala Nagaraju <[email protected]>
Prints live state of psr1.Extending the existing
PSR2 live state function to cover psr1.Tested on KBL with psr2 and psr1 panel.
v2: rebase
v3: DK
Renamepsr2_live_statustopsr_source_status.
v4: DK
MoveEDP_PSR_STATUS_STATE_SHIFTbelowEDP_PSR_STATUS_STATE_MASK. Pass seq topsr_source_status, handle source status prints inpsr_source_status.
v5: Fixed CI warning messages
Quoted 6 lines
Quoted 3 lines
Cc Rodrigo Vivi <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>nit: Noticed an extra space in the title before the colon.
Reviewed-by Dhinakaran Pandiyan <[email protected]>
I'm afraid this no longer applies cleanly. Please resend if it's still needed.
BR,
Jani.
Quoted 85 lines
Quoted 70 lines
Signed-off-by Vathsala Nagaraju <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 72 ++++++++++++++++++++++++---
----------
drivers/gpu/drm/i915/i915_reg.h | 1 +2 files changed, 49 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2596,27 +2596,55 @@ static int i915_guc_log_relay_release(struct inode *inode, struct file *file) .release = i915_guc_log_relay_release, };drivers/gpu/drm/i915/i915_debugfs.c +2
-15-static const char *psr2_live_status (u32 val) -{ -static const char *const live_status[] = { -"IDLE" , -"CAPTURE" , -"CAPTURE_FS" , -"SLEEP" , -"BUFON_FW" , -"ML_UP" , -"SU_STANDBY" , -"FAST_SLEEP" , -"DEEP_SLEEP" , -"BUF_ON" , -"TG_ON" - }; +static void +psr_source_status(struct drm_i915_private *dev_priv, struct seq_file*m)
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+{ +u32 val, psr_status =0 ;drivers/gpu/drm/i915/i915_debugfs.c +0
-1- val = (val & EDP_PSR2_STATUS_STATE_MASK) >>
EDP_PSR2_STATUS_STATE_SHIFT;drivers/gpu/drm/i915/i915_debugfs.c +19
-2-if (val <ARRAY_SIZE (live_status)) -return live_status[val]; +if (dev_priv->psr.psr2_enabled) { +static const char *const live_status[] = { +"IDLE" , +"CAPTURE" , +"CAPTURE_FS" , +"SLEEP" , +"BUFON_FW" , +"ML_UP" , +"SU_STANDBY" , +"FAST_SLEEP" , +"DEEP_SLEEP" , +"BUF_ON" , +"TG_ON" + }; + psr_status =I915_READ (EDP_PSR2_STATUS ); + val = (psr_status & EDP_PSR2_STATUS_STATE_MASK) >> +EDP_PSR2_STATUS_STATE_SHIFT ; +if (val <ARRAY_SIZE (live_status)) { + seq_printf(m, "Source PSR status: %x[%s]\n",
psr_status,drivers/gpu/drm/i915/i915_debugfs.c +7
-0+ live_status[val]); +return ; + } + }else { +static const char *const live_status[] = { +"IDLE" , + "SRDONACK",drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_log_relay_release(struct inode *inode, struct file *file) · line 2639
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+"SRDENT" , +"BUFOFF" , +"BUFON" , +"AUXACK" , +"SRDOFFACK" , +"SRDENT_ON" , + }; + psr_status =I915_READ (EDP_PSR_STATUS ); + val = (psr_status &EDP_PSR_STATUS_STATE_MASK ) >> +EDP_PSR_STATUS_STATE_SHIFT ;^alignment is different from the PSR2 block.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx