diff mbox series

[1/4] drm/i915/psr: Update PSR2 SU corruption workaround comment

Message ID 20190406005112.27205-1-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915/psr: Update PSR2 SU corruption workaround comment | expand

Commit Message

Souza, Jose April 6, 2019, 12:51 a.m. UTC
Turn out it is not a DMC bug it is actually a HW one, so this
workaround will be needed for current gens, lets update the comment
and remove the FIXME.

BSpec: 7723
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/intel_psr.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Souza, Jose April 8, 2019, 6 p.m. UTC | #1
On Sun, 2019-04-07 at 02:45 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/4] drm/i915/psr: Update PSR2 SU
> corruption workaround comment
> URL   : https://patchwork.freedesktop.org/series/59087/
> State : success
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_5882_full -> Patchwork_12713_full
> ====================================================
> 
> Summary
> -------
> 
>   **SUCCESS**
> 
>   No regressions found.

Pushed to dinq, thanks for the reviews Rodrigo and Dhinakaran.

> 
>   
> 
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_12713_full that come from
> known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_mmap_gtt@big-copy-odd:
>     - shard-iclb:         PASS -> TIMEOUT [fdo#109673]
> 
>   * igt@gem_mmap_gtt@hang:
>     - shard-iclb:         PASS -> FAIL [fdo#109677]
> 
>   * igt@gem_pread@stolen-uncached:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109277]
> 
>   * igt@gem_pwrite@huge-gtt-forwards:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109290]
> 
>   * igt@i915_selftest@live_workarounds:
>     - shard-iclb:         PASS -> DMESG-FAIL [fdo#108954]
> 
>   * igt@kms_atomic_transition@2x-modeset-transitions-nonblocking:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109280] +3
> 
>   * igt@kms_atomic_transition@3x-modeset-transitions:
>     - shard-snb:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
> +12
> 
>   * igt@kms_atomic_transition@3x-modeset-transitions-fencing:
>     - shard-kbl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
> 
>   * igt@kms
> _atomic_transition@plane-all-modeset-transition-internal-panels:
>     - shard-kbl:          NOTRUN -> SKIP [fdo#109271] +22
> 
>   * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-d:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109278]
> 
>   * igt@kms_busy@extended-pageflip-hang-oldfb-render-f:
>     - shard-skl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
> +1
> 
>   * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
>     - shard-skl:          NOTRUN -> DMESG-WARN [fdo#110222]
> 
>   * igt@kms_chamelium@hdmi-cmp-yu16:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109284]
> 
>   * igt@kms_cursor_legacy@cursor-vs-flip-atomic:
>     - shard-iclb:         PASS -> FAIL [fdo#103355]
> 
>   * igt@kms_flip@2x-flip-vs-expired-vblank:
>     - shard-glk:          PASS -> FAIL [fdo#105363]
> 
>   * igt@kms_flip@2x-flip-vs-fences:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109274] +1
> 
>   * igt@kms_flip@flip-vs-suspend:
>     - shard-skl:          PASS -> INCOMPLETE [fdo#109507]
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
>     - shard-iclb:         PASS -> FAIL [fdo#103167] +1
> 
>   * igt@kms
> _frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-render:
>     - shard-skl:          PASS -> FAIL [fdo#103167]
> 
>   * igt@kms
> _frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt:
>     - shard-iclb:         PASS -> FAIL [fdo#109247] +3
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-shrfb-scaledprimary:
>     - shard-apl:          NOTRUN -> SKIP [fdo#109271] +12
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-shrfb-pgflip-blt:
>     - shard-snb:          NOTRUN -> SKIP [fdo#109271] +77
> 
>   * igt@kms_lease@setcrtc_implicit_plane:
>     - shard-skl:          NOTRUN -> FAIL [fdo#110281]
> 
>   * igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
>     - shard-skl:          NOTRUN -> FAIL [fdo#108145] +1
> 
>   * igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
>     - shard-kbl:          NOTRUN -> FAIL [fdo#108145] / [fdo#108590]
> 
>   * igt@kms_plane_scaling@pipe-a-scaler-with-pixel-format:
>     - shard-glk:          PASS -> SKIP [fdo#109271] / [fdo#109278] +1
> 
>   * igt@kms_psr@no_drrs:
>     - shard-iclb:         PASS -> FAIL [fdo#108341]
> 
>   * igt@kms_psr@psr2_primary_mmap_gtt:
>     - shard-iclb:         PASS -> SKIP [fdo#109441] +3
> 
>   * igt@kms_psr@psr2_sprite_blt:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109441]
> 
>   * igt@kms_psr@sprite_plane_onoff:
>     - shard-iclb:         PASS -> FAIL [fdo#107383] / [fdo#110215]
> 
>   * igt@kms_rotation_crc@multiplane-rotation-cropping-top:
>     - shard-kbl:          PASS -> FAIL [fdo#109016]
> 
>   * igt@kms_rotation_crc@primary-x-tiled-reflect-x-180:
>     - shard-iclb:         PASS -> INCOMPLETE [fdo#110026]
> 
>   * igt@perf_pmu@semaphore-wait-vcs1:
>     - shard-skl:          NOTRUN -> SKIP [fdo#109271] +43
> 
>   * igt@prime_busy@wait-after-bsd1:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109276] +1
> 
>   * igt@tools_test@sysfs_l3_parity:
>     - shard-iclb:         NOTRUN -> SKIP [fdo#109307]
> 
>   
> #### Possible fixes ####
> 
>   * igt@gem_tiled_pread_pwrite:
>     - shard-iclb:         TIMEOUT [fdo#109673] -> PASS
> 
>   * igt@i915_pm_rpm@system-suspend-modeset:
>     - shard-iclb:         FAIL [fdo#103375] -> PASS +1
> 
>   * igt@i915_suspend@sysfs-reader:
>     - shard-kbl:          INCOMPLETE [fdo#103665] -> PASS
> 
>   * igt@kms_busy@extended-modeset-hang-newfb-render-a:
>     - shard-iclb:         DMESG-WARN [fdo#110222] -> PASS
> 
>   * igt@kms
> _cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
>     - shard-glk:          FAIL [fdo#106509] / [fdo#107409] -> PASS
> 
>   * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
>     - shard-glk:          FAIL [fdo#105363] -> PASS
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
>     - shard-iclb:         FAIL [fdo#103167] -> PASS +4
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-pwrite:
>     - shard-iclb:         FAIL [fdo#105682] / [fdo#109247] -> PASS
> 
>   * igt@kms
> _frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-pwrite:
>     - shard-iclb:         FAIL [fdo#109247] -> PASS +15
> 
>   * igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
>     - shard-glk:          SKIP [fdo#109271] -> PASS
> 
>   * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
>     - shard-skl:          INCOMPLETE [fdo#104108] / [fdo#107773] ->
> PASS
> 
>   * igt@kms_plane_scaling@pipe-a-scaler-with-rotation:
>     - shard-glk:          SKIP [fdo#109271] / [fdo#109278] -> PASS +2
> 
>   * igt@kms_psr@psr2_cursor_mmap_cpu:
>     - shard-iclb:         SKIP [fdo#109441] -> PASS +1
> 
>   * igt@kms_psr@sprite_mmap_cpu:
>     - shard-iclb:         FAIL [fdo#107383] / [fdo#110215] -> PASS
> 
>   * igt@kms_setmode@basic:
>     - shard-skl:          FAIL [fdo#99912] -> PASS
> 
>   * igt@perf@polling:
>     - shard-iclb:         FAIL [fdo#108587] -> PASS
> 
>   
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
>   [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
>   [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
>   [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
>   [fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
>   [fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
>   [fdo#107409]: https://bugs.freedesktop.org/show_bug.cgi?id=107409
>   [fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
>   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   [fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
>   [fdo#108587]: https://bugs.freedesktop.org/show_bug.cgi?id=108587
>   [fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
>   [fdo#108954]: https://bugs.freedesktop.org/show_bug.cgi?id=108954
>   [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
>   [fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109277]: https://bugs.freedesktop.org/show_bug.cgi?id=109277
>   [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
>   [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
>   [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
>   [fdo#109290]: https://bugs.freedesktop.org/show_bug.cgi?id=109290
>   [fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
>   [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>   [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
>   [fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
>   [fdo#109677]: https://bugs.freedesktop.org/show_bug.cgi?id=109677
>   [fdo#110026]: https://bugs.freedesktop.org/show_bug.cgi?id=110026
>   [fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
>   [fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
>   [fdo#110281]: https://bugs.freedesktop.org/show_bug.cgi?id=110281
>   [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> Participating hosts (10 -> 9)
> ------------------------------
> 
>   Missing    (1): shard-hsw 
> 
> 
> Build changes
> -------------
> 
>     * Linux: CI_DRM_5882 -> Patchwork_12713
> 
>   CI_DRM_5882: 012535789c9c890854cd1e0fb926f44931a82a63 @
> git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4932: 08cf63a8fac11e3594b57580331fb319241a0d69 @
> git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_12713: 4bdb687ef694e307b68eb4ff2b91e59d68b576d0 @
> 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_12713/
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index ec874d802d48..c80bb3003a7d 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -531,10 +531,8 @@  static void hsw_activate_psr2(struct intel_dp *intel_dp)
 		val |= EDP_PSR2_TP2_TIME_2500us;
 
 	/*
-	 * FIXME: There is probably a issue in DMC firmwares(icl_dmc_ver1_07.bin
-	 * and kbl_dmc_ver1_04.bin at least) that causes PSR2 SU to fail after
-	 * exiting DC6 if EDP_PSR_TP1_TP3_SEL is kept in PSR_CTL, so for now
-	 * lets workaround the issue by cleaning PSR_CTL before enable PSR2.
+	 * PSR2 HW is incorrectly using EDP_PSR_TP1_TP3_SEL and BSpec is
+	 * recommending keep this bit unset while PSR2 is enabled.
 	 */
 	I915_WRITE(EDP_PSR_CTL, 0);