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
v6:
Remove extra space in the title before the colon.(DK) Rebase. (Jani)
v7: use tabs for indenting the values.(Jani)
--- 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
@@ -2597,27 +2597,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)
@@ -2681,12 +2709,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
@@ -4072,6 +4072,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 (rev2)
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Add psr1 live status (rev2)
URL : https://patchwork.freedesktop.org/series/45143/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4368 -> Patchwork_9392 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45143/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_9392 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
==== Possible fixes ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-bxt-dsi: INCOMPLETE (fdo#103927) -> PASS fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
== Participating hosts (43 -> 37) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-glk-dsi fi-bsw-cyan fi-ctg-p8600 fi-kbl-x1275
== Build changes ==
* Linux: CI_DRM_4368 -> Patchwork_9392
CI_DRM_4368: f9f621dc095a8bfd2157fba018ddb542260d8daa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528: 6be300d405de5974b262e8b93a445be4ac618e6a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9392: 717c5cfed95ac3cf27eebdf934d00cf179523c5b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
717c5cfed95a drm/i915/psr: Add psr1 live status
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9392/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 (rev2)
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: drm/i915/psr: Add psr1 live status (rev2)
URL : https://patchwork.freedesktop.org/series/45143/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4368_full -> Patchwork_9392_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9392_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9392_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9392_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-bsd1:
shard-kbl: SKIP -> PASS +1
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: PASS -> SKIP +1== Known issues ==
Here are the changes found in Patchwork_9392_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_await@wide-contexts:
shard-apl: PASS -> FAIL (fdo#106680, fdo#105900)
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-kbl: PASS -> FAIL (fdo#105363, fdo#102887)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
shard-glk: PASS -> FAIL (fdo#103375)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
shard-kbl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@gem_workarounds@suspend-resume-context:
shard-apl: FAIL (fdo#103375) -> PASS +1
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-glk: FAIL (fdo#102887) -> PASS
igt@kms_flip@modeset-vs-vblank-race-interruptible:
shard-glk: FAIL (fdo#103060) -> PASS
igt@kms_flip@plain-flip-fb-recreate-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS +1
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS +1
igt@perf_pmu@busy-idle-check-all-rcs0:
shard-snb: INCOMPLETE (fdo#105411) -> PASS fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105900 https://bugs.freedesktop.org/show_bug.cgi?id=105900
fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
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_4368 -> Patchwork_9392
CI_DRM_4368: f9f621dc095a8bfd2157fba018ddb542260d8daa @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4528: 6be300d405de5974b262e8b93a445be4ac618e6a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9392: 717c5cfed95ac3cf27eebdf934d00cf179523c5b @ 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_9392/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 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.
Quoted 12 lines
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
v6:
Remove extra space in the title before the colon.(DK) Rebase. (Jani)
v7: use tabs for indenting the values.(Jani)
This made me go through the patch again, I'm afraid I see more formatting (mostly) issues. Sorry for not noticing earlier.
Quoted 39 lines
Cc Rodrigo Vivi <[email protected]>Cc Dhinakaran Pandiyan <[email protected]>Reviewed-by Dhinakaran Pandiyan <[email protected]>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@@ -2597,27 +2597,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 static int i915_guc_log_relay_release(struct inode *inode, struct file *file) · line 2603
Quoted 2 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+{ +u32 val, psr_status =0 ;
unnecessary initialization.
Quoted 11 lines
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 +6
-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" ,
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_log_relay_release(struct inode *inode, struct file *file) · line 2620
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+"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) >>
^extra space here.
drivers/gpu/drm/i915/i915_debugfs.c static int i915_guc_log_relay_release(struct inode *inode, struct file *file)
Quoted 3 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+EDP_PSR2_STATUS_STATE_SHIFT ; +if (val <ARRAY_SIZE (live_status)) { + seq_printf(m, "Source PSR status: %x[%s]\n",
0x%x [%s] i.e., you're missing the 0x prefix to denote hex numerals and a space.
Quoted 26 lines
psr_status,drivers/gpu/drm/i915/i915_debugfs.c +19
-0+ 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,drivers/gpu/drm/i915/i915_debugfs.c +4
-0+ live_status[val]); +return ; + } + }
drivers/gpu/drm/i915/i915_debugfs.c
Quoted 2 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1-return "unknown" ; + seq_printf(m, "Source psr status: %x[%s]\n", psr_status,
^lower case is inconsistent with the other debugs you are printing.
Quoted 26 lines
"unknown");
}
static const char *psr_sink_status(u8 val)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2681,12 +2709,8 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)
seq_printf(m, "Performance_Counter: %u\n", psrperf); }drivers/gpu/drm/i915/i915_debugfs.c +0
-2-if (dev_priv->psr.psr2_enabled) { -u32 psr2 =I915_READ (EDP_PSR2_STATUS );drivers/gpu/drm/i915/i915_debugfs.c +1
-3-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) {
structdrm_dp_aux*aux = &dev_priv->psr.enabled-Quoted 1 line
aux;
drivers/gpu/drm/i915/i915_reg.h +0
-0@@ -4072,6 +4072,7 @@ enum {
Quoted 8 lines
#defineEDP_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)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx