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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 71 ++++++++++++++++++++++++------------- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 48 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +47 -24
@@ -2596,27 +2596,54 @@ 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" - }; +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 +2741,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.CHECKPATCH: warning for drm/i915/psr : Add psr1 live status (rev4)
== Series Details ==
== Series Details ==
Series: drm/i915/psr : Add psr1 live status (rev4)
URL : https://patchwork.freedesktop.org/series/42021/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 48d7912a5bd7 drm/i915/psr : Add psr1 live status -:73: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #73: FILE: drivers/gpu/drm/i915/i915_debugfs.c:2622: + seq_printf(m, "Source PSR status: %x[%s]\n", psr_status, + live_status[val]);
-:92: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #92: FILE: drivers/gpu/drm/i915/i915_debugfs.c:2641:
+ seq_printf(m, "Source PSR status: %x[%s]\n", psr_status,
+ live_status[val]);
total: 0 errors, 0 warnings, 2 checks, 93 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm/i915/psr : Add psr1 live status (rev4)
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: drm/i915/psr : Add psr1 live status (rev4)
URL : https://patchwork.freedesktop.org/series/42021/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915/psr : Add psr1 live status +drivers/gpu/drm/i915/i915_debugfs.c:2599:6: warning: symbol 'psr_source_status' was not declared. Should it be static?
_______________________________________________
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 (rev4)
In reply to vathsala nagaraju== Series Details ==
== Series Details ==
Series: drm/i915/psr : Add psr1 live status (rev4)
URL : https://patchwork.freedesktop.org/series/42021/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4237 -> Patchwork_9114 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/42021/revisions/4/mbox/
== Known issues ==
Here are the changes found in Patchwork_9114 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: PASS -> FAIL (fdo#102575)fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
== 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_9114
CI_DRM_4237: 7e428318149fae612783841e39d25b5e8a000171 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4498: f9ecb79ad8b02278cfdb5b82495df47061c04f8f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9114: 48d7912a5bd7447e492a28fa48c5eadd341962e3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
48d7912a5bd7 drm/i915/psr : Add psr1 live status
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9114/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx