drm/i915/psr: report psr2 hw enabled from psr2_ctl
Subsystems (2)
PATCH 1/1 drm/i915/psr: report psr2 hw enabled from psr2_ctl
For PSR2 , as per spec, PSR2_CTL bit 31 to be set. for psr1, bit 31 in SRD_CTL to be set. Reporting "HW Enabled & Active bit" status for psr2 from SRD_CTL gives wrong status.
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -3
@@ -2567,9 +2567,12 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev_priv)) - enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; -else { +if (HAS_DDI (dev_priv)) { +if (dev_priv->psr.psr2_support) + enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ; +else + enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; + }else {for_each_pipe (dev_priv, pipe) {enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);
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: warning for drm/i915/psr: report psr2 hw enabled from psr2_ctl
== Series Details ==
== Series Details ==
Series: drm/i915/psr: report psr2 hw enabled from psr2_ctl
URL : https://patchwork.freedesktop.org/series/16628/
State : warning
== Summary ==
Series 16628v1 drm/i915/psr: report psr2 hw enabled from psr2_ctl
https://patchwork.freedesktop.org/api/1.0/series/16628/revisions/1/mbox/
Test drv_module_reload:
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-ilk-650)fi-bdw-5557u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:247 pass:208 dwarn:0 dfail:0 fail:0 skip:39 fi-byt-j1900 total:247 pass:220 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:247 pass:228 dwarn:0 dfail:0 fail:0 skip:19 fi-ilk-650 total:247 pass:194 dwarn:1 dfail:0 fail:0 skip:52 fi-ivb-3520m total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:247 pass:224 dwarn:3 dfail:0 fail:0 skip:20 fi-skl-6770hq total:247 pass:234 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2520m total:247 pass:216 dwarn:0 dfail:0 fail:0 skip:31 fi-snb-2600 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
de43f4e755c6bf50ad53b4ccacedf9850f42eda4 drm-tip: 2016y-12m-09d-09h-01m-58s UTC integration manifest 09b16b9 drm/i915/psr: report psr2 hw enabled from psr2_ctl
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3256/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 39 lines · vathsala nagaraju
For PSR2 , as per spec,
PSR2_CTLbit 31 to be set. for psr1, bit 31 inSRD_CTLto be set. Reporting "HW Enabled & Active bit" status for psr2 fromSRD_CTLgives wrong status.Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-3@@ -2567,9 +2567,12 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev_priv)) - enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; -else { +if (HAS_DDI (dev_priv)) { +if (dev_priv->psr.psr2_support) + enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ; +else + enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; + }else {for_each_pipe (dev_priv, pipe) {enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);Signature · 6 lines
1.9.1 _______________________________________________ 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
Rodrigo Vivi
Appliedmerged to dinq, thanks for the patch.
Quoted 33 lines · Rodrigo Vivi
Reviewed-by Rodrigo Vivi <[email protected]>Quoted 5 lines · vathsala nagaraju
For PSR2 , as per spec,
PSR2_CTLbit 31 to be set. for psr1, bit 31 inSRD_CTLto be set. Reporting "HW Enabled & Active bit" status for psr2 fromSRD_CTLgives wrong status.Review
Quoted 8 lines
Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_debugfs.cdrivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file
Quoted 4 lines
index a746130..54e196d 100644
drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2567,9 +2567,12 @@ static int i915_edp_psr_status(struct seq_file*m, void *data)
drivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file *m, void *data)
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-3seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev_priv)) - enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; -else { +if (HAS_DDI (dev_priv)) { +if (dev_priv->psr.psr2_support) + enabled = I915_READ(EDP_PSR2_CTL) &
Quoted 16 lines
EDP_PSR2_ENABLE;drivers/gpu/drm/i915/i915_debugfs.c static int i915_edp_psr_status(struct seq_file *m, void *data)
Quoted 6 lines
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+else + enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; + }else {for_each_pipe (dev_priv, pipe) {enum transcoder cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv,pipe);
Quoted 7 lines
--
1.9.1_______________________________________________
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
Quoted 8 lines · vathsala nagaraju
For PSR2 , as per spec,
PSR2_CTLbit 31 to be set. for psr1, bit 31 inSRD_CTLto be set. Reporting "HW Enabled & Active bit" status for psr2 fromSRD_CTLgives wrong status.Cc Rodrigo Vivi <[email protected]>Cc Jim Bride <[email protected]>Signed-off-by vathsala nagaraju <[email protected]>
Quoted 26 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-3@@ -2567,9 +2567,12 @@ static int i915_edp_psr_status(struct seq_file *m, void *data)seq_printf (m,"Re-enable work scheduled: %s\n" ,yesno (work_busy (&dev_priv->psr.work.work))); -if (HAS_DDI (dev_priv)) - enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; -else { +if (HAS_DDI (dev_priv)) { +if (dev_priv->psr.psr2_support) + enabled =I915_READ (EDP_PSR2_CTL ) &EDP_PSR2_ENABLE ; +else + enabled =I915_READ (EDP_PSR_CTL ) &EDP_PSR_ENABLE ; + }else {for_each_pipe (dev_priv, pipe) {enum transcoder cpu_transcoder =intel_pipe_to_cpu_transcoder (dev_priv, pipe);Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx