drm/i915/psr: Fix register name mess up.
Subsystems (2)
PATCH 1/1 drm/i915/psr: Fix register name mess up.
Commit 77affa31722b ("drm/i915/psr: Fix compiler warnings for hsw_psr_disable()") swapped status and control registers while fixing indentation. The _ctl at the end of the status register name must have to led to this.
--- drivers/gpu/drm/i915/intel_psr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_psr.c +8 -8
@@ -580,7 +580,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -i915_reg_t psr_ctl; +i915_reg_t psr_status;u32 psr_status_mask;if (dev_priv->psr.aux_frame_sync)
@@ -589,24 +589,24 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, 0);if (dev_priv->psr.psr2_support) { - psr_ctl =EDP_PSR2_CTL ; + psr_status =EDP_PSR2_STATUS_CTL ; psr_status_mask =EDP_PSR2_STATUS_STATE_MASK ; -I915_WRITE (psr_ctl, -I915_READ (psr_ctl) & +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & ~(EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE )); }else { - psr_ctl =EDP_PSR_STATUS_CTL ; + psr_status =EDP_PSR_STATUS_CTL ; psr_status_mask =EDP_PSR_STATUS_STATE_MASK ; -I915_WRITE (psr_ctl, -I915_READ (psr_ctl) & ~EDP_PSR_ENABLE ); +I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); }/* Wait till PSR is idle */ if (intel_wait_for_register (dev_priv, - psr_ctl, psr_status_mask,0 , + psr_status, psr_status_mask,0 ,2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" );
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/psr: Fix register name mess up.
== Series Details ==
== Series Details ==
Series: drm/i915/psr: Fix register name mess up.
URL : https://patchwork.freedesktop.org/series/35607/
State : success
== Summary ==
Series 35607v1 drm/i915/psr: Fix register name mess up.
https://patchwork.freedesktop.org/api/1.0/series/35607/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-kbl-r) fdo#104172 +1
Test kms_psr_sink_crc:
Subgroup psr_basic:
pass -> DMESG-WARN (fi-skl-6700hq) fdo#101144fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:433s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:380s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:495s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:276s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:493s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:496s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:473s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:465s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:179 dwarn:1 dfail:0 fail:0 skip:108 time:264s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:529s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:408s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:413s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:383s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:472s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:432s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:480s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:519s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:468s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:517s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:581s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:447s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:534s fi-skl-6700hq total:288 pass:261 dwarn:1 dfail:0 fail:0 skip:26 time:551s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:505s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:486s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:450s fi-snb-2520m total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:410s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:604s fi-cnl-y total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:620s
e27ee23e076d5ac016fec87e3273be9cc91d9b20 drm-tip: 2017y-12m-19d-23h-07m-26s UTC integration manifest 48a2e41d0fb0 drm/i915/psr: Fix register name mess up.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7544/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: Fix register name mess up.
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: drm/i915/psr: Fix register name mess up.
URL : https://patchwork.freedesktop.org/series/35607/
State : success
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
fail -> PASS (shard-snb) fdo#101623 +1fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
shard-hsw total:2712 pass:1537 dwarn:1 dfail:0 fail:10 skip:1164 time:9417s shard-snb total:2712 pass:1310 dwarn:1 dfail:0 fail:10 skip:1391 time:8095s Blacklisted hosts: shard-apl total:2712 pass:1688 dwarn:1 dfail:0 fail:22 skip:1001 time:13807s shard-kbl total:2640 pass:1740 dwarn:27 dfail:1 fail:24 skip:847 time:10817s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7544/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · PST Dhinakaran Pandiyan
Commit
77affa31722b("drm/i915/psr: Fix compiler warnings forhsw_psr_disable()") swapped status and control registers while fixing indentation. The_ctlat the end of the status register name must have to led to this.Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>
Quoted 39 lines
Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/intel_psr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_psr.cindex 095e0a5a8574..863650366425 100644drivers/gpu/drm/i915/intel_psr.c +5
-7@@ -580,7 +580,7 @@ static void hsw_psr_disable(struct intel_dp *intel_dp,struct drm_i915_private *dev_priv =to_i915 (dev);if (dev_priv->psr.active) { -i915_reg_t psr_ctl; +i915_reg_t psr_status;u32 psr_status_mask;if (dev_priv->psr.aux_frame_sync)@@ -589,24 +589,24 @@ static void hsw_psr_disable(struct intel_dp *intel_dp, 0);if (dev_priv->psr.psr2_support) { - psr_ctl =EDP_PSR2_CTL ; + psr_status =EDP_PSR2_STATUS_CTL ; psr_status_mask =EDP_PSR2_STATUS_STATE_MASK ; -I915_WRITE (psr_ctl, -I915_READ (psr_ctl) & +I915_WRITE (EDP_PSR2_CTL , +I915_READ (EDP_PSR2_CTL ) & ~(EDP_PSR2_ENABLE |EDP_SU_TRACK_ENABLE )); }else { - psr_ctl =EDP_PSR_STATUS_CTL ; + psr_status =EDP_PSR_STATUS_CTL ; psr_status_mask =EDP_PSR_STATUS_STATE_MASK ; -I915_WRITE (psr_ctl, -I915_READ (psr_ctl) & ~EDP_PSR_ENABLE );
drivers/gpu/drm/i915/intel_psr.c static void hsw_psr_disable(struct intel_dp *intel_dp, · line 611
Quoted 10 lines
drivers/gpu/drm/i915/intel_psr.c +3
-1+I915_WRITE (EDP_PSR_CTL , +I915_READ (EDP_PSR_CTL ) & ~EDP_PSR_ENABLE ); }/* Wait till PSR is idle */ if (intel_wait_for_register (dev_priv, - psr_ctl, psr_status_mask,0 , + psr_status, psr_status_mask,0 ,2000 ))DRM_ERROR ("Timed out waiting for PSR Idle State\n" );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Dhinakaran Pandiyan (2017-12-20 06:46:51)
Quoted 10 lines · PST Dhinakaran Pandiyan
Quoted 7 lines
Commit
77affa31722b("drm/i915/psr: Fix compiler warnings forhsw_psr_disable()") swapped status and control registers while fixing indentation. The_ctlat the end of the status register name must have to led to this.Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>Fixes 77affa31722b ("drm/i915/psr: Fix compiler warnings for hsw_psr_disable()")Quoted 1 line
Signed-off-by Dhinakaran Pandiyan <[email protected]>
Pushed, thanks for fixing up my mistake.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Dhinakaran Pandiyan (2017-12-20 04:35:20)
Quoted 4 lines
Commit
77affa31722b("drm/i915/psr: Fix compiler warnings forhsw_psr_disable()") swapped status and control registers while fixing indentation. The_ctlat the end of the status register name must have to led to this.
My bad. https://www.mrc-cbu.cam.ac.uk/people/matt.davis/cmabridge/
So what does STATUS_CTL control? That seems to be a bad name, does bspec really call it that?
References: https://www.mrc-cbu.cam.ac.uk/people/matt.davis/cmabridge/
Quoted 3 lines
Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Chris Wilson
Quoting Dhinakaran Pandiyan (2017-12-20 04:35:20)
Quoted 4 lines
Commit
77affa31722b("drm/i915/psr: Fix compiler warnings forhsw_psr_disable()") swapped status and control registers while fixing indentation. The_ctlat the end of the status register name must have to led to this.My bad. https://www.mrc-cbu.cam.ac.uk/people/matt.davis/cmabridge/
Yeah, took me several rounds of checking to ensure I changed it correctly.
Quoted 2 lines
So what does
STATUS_CTLcontrol? That seems to be a bad name, does bspec really call it that?
So I looked it up, it doesn't. I'll send a patch soon. -DK
Quoted 7 lines
References: https://www.mrc-cbu.cam.ac.uk/people/matt.davis/cmabridge/
Quoted 3 lines
Cc Chris Wilson <[email protected]>Cc Rodrigo Vivi <[email protected]>Signed-off-by Dhinakaran Pandiyan <[email protected]>Reviewed-by Chris Wilson <[email protected]>-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx