drm/i915: Add display WA #1175 for planes ending close to right screen edge
Subsystems (2)
PATCH v2 1/2 drm/i915: Add display WA #1175 for planes ending close to right screen edge
As described in the WA on GLK and CNL planes on the right edge of the screen that have less than 4 pixels visible from the beginning of the plane to the edge of the screen can cause FIFO underflow and display corruption.
On GLK/CNL I could trigger the problem only if the plane was at the same time also aligned to the top edge of the screen (after clipping) and there were exactly 2 pixels visible from the start of the plane to the right edge of the screen (so couldn't trigger it with 1 or 3 pixels visible). Nevertheless, to be sure, I also applied the WA for these cases.
I also couldn't see any problem with the cursor plane and later Art confirmed that it's not affected, so the WA is applied only for the other plane types.
v2:
- Use -ERANGE instead of -EINVAL. (Chris)
--- drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +24 -4
@@ -2917,14 +2917,19 @@ static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_statereturn true; } -static int skl_check_main_surface (struct intel_plane_state *plane_state) +static int skl_check_main_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) { +struct drm_i915_private *dev_priv = +to_i915 (plane_state->base.plane->dev);const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation;int x = plane_state->base.src.x1 >>16 ;int y = plane_state->base.src.y1 >>16 ;int w =drm_rect_width (&plane_state->base.src) >>16 ;int h =drm_rect_height (&plane_state->base.src) >>16 ; +int dst_x = plane_state->base.dst.x1; +int pipe_src_w = crtc_state->pipe_src_w;int max_width =skl_max_plane_width (fb,0 , rotation);int max_height =4096 ;u32 alignment, offset, aux_offset = plane_state->aux.offset;
@@ -2935,6 +2940,20 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state)return -EINVAL ; } +/* +* Display WA #1175: cnl,glk +* Planes other than the cursor may cause FIFO underflow and display +* corruption if starting less than 4 pixels from the right edge of +* the screen. +*/ +if ((IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) && + dst_x > pipe_src_w -4 ) { +DRM_DEBUG_KMS ("requested plane X start position %d invalid (valid range %d-%d)\n" , + dst_x, +0 , pipe_src_w -4 ); +return -ERANGE ; + } +intel_add_fb_offsets (&x, &y, plane_state,0 ); offset =intel_compute_tile_offset (&x, &y, plane_state,0 ); alignment =intel_surf_alignment (fb,0 );
@@ -3067,7 +3086,8 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)return 0 ; } -int skl_check_plane_surface (struct intel_plane_state *plane_state) +int skl_check_plane_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) {const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation;
@@ -3107,7 +3127,7 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state) plane_state->aux.y =0 ; } - ret =skl_check_main_surface (plane_state); + ret =skl_check_main_surface (crtc_state, plane_state);if (ret)return ret;
@@ -12766,7 +12786,7 @@ intel_check_primary_plane(struct intel_plane *plane,return 0 ;if (INTEL_GEN (dev_priv) >=9 ) { - ret =skl_check_plane_surface (state); + ret =skl_check_plane_surface (crtc_state, state);if (ret)return ret;
drivers/gpu/drm/i915/intel_drv.h +2 -1
@@ -1588,7 +1588,8 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state);u32 skl_plane_stride (const struct drm_framebuffer *fb,int plane,unsigned int rotation); -int skl_check_plane_surface (struct intel_plane_state *plane_state); +int skl_check_plane_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state);int i9xx_check_plane_surface (struct intel_plane_state *plane_state);/* intel_csr.c */
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -1027,7 +1027,7 @@ intel_check_sprite_plane(struct intel_plane *plane, dst->y2 = crtc_y + crtc_h;if (INTEL_GEN (dev_priv) >=9 ) { - ret =skl_check_plane_surface (state); + ret =skl_check_plane_surface (crtc_state, state);if (ret)return ret;
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/2 drm/i915: Add WA for planes ending close to left screen edge
While running the kms_plane clipping test I noticed a similar problem to the one described in Display WA #1175. In this case, similarly for planes other than the cursor, with 1 or 3 pixels visible from the left edge of the screen to the end of the plane and an odd plane X offset used for clipping causes the same kind of underflow and display corruption as described for WA #1175. Fix this in a similar way as that WA rejecting planes ending <4 pixels from the left screen edge.
v2:
- Rebase on v2 of patch 1/1.
Testcase: igt/kms_plane/plane-clipping-pipe-*-planes
--- drivers/gpu/drm/i915/intel_display.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +8 -4
@@ -2945,12 +2945,16 @@ static int skl_check_main_surface(const struct intel_crtc_state *crtc_state,* Planes other than the cursor may cause FIFO underflow and display * corruption if starting less than 4 pixels from the right edge of * the screen. +* Besides the above WA fix the similar problem, where planes other +* than the cursor ending less than 4 pixels from the left edge of the +* screen may cause FIFO underflow and display corruption. */ if ((IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) && - dst_x > pipe_src_w -4 ) { -DRM_DEBUG_KMS ("requested plane X start position %d invalid (valid range %d-%d)\n" , - dst_x, -0 , pipe_src_w -4 ); + (dst_x + w <4 || dst_x > pipe_src_w -4 )) { +DRM_DEBUG_KMS ("requested plane X %s position %d invalid (valid range %d-%d)\n" , + dst_x + w <4 ?"end" :"start" , + dst_x + w <4 ? dst_x + w : dst_x, +4 , pipe_src_w -4 );return -ERANGE ; }
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
URL : https://patchwork.freedesktop.org/series/36526/
State : success
== Summary ==
Series 36526v1 series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
https://patchwork.freedesktop.org/api/1.0/series/36526/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-kbl-r) fdo#104172 +1fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#104172 https://bugs.freedesktop.org/show_bug.cgi?id=104172
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:425s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:372s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:483s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:282s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:488s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:465s fi-elk-e7500 total:224 pass:168 dwarn:10 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:278s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:510s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:391s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:400s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:413s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:453s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:413s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:464s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:499s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:455s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:505s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:574s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:429s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:507s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:528s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:488s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:474s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:438s 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:399s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:575s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:464s
fi-byt-n2820 failed to collect. IGT log at Patchwork_7680/fi-byt-n2820/igt.log
a0ca279440c8d7c40d798fed9939a2a25b31434b drm-tip: 2018y-01m-16d-10h-49m-51s UTC integration manifest b6d1a0325bb4 drm/i915: Add WA for planes ending close to left screen edge 54c44787c352 drm/i915: Add display WA #1175 for planes ending close to right screen edge
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7680/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
URL : https://patchwork.freedesktop.org/series/36526/
State : failure
== Summary ==
Test drv_selftest:
Subgroup mock_fence:
pass -> DMESG-FAIL (shard-hsw)
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test kms_flip:
Subgroup flip-vs-fences-interruptible:
dmesg-warn -> PASS (shard-hsw) fdo#102614
Subgroup vblank-vs-modeset-suspend:
pass -> SKIP (shard-hsw)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-pri-indfb-multidraw:
pass -> SKIP (shard-snb) fdo#103167
Test kms_plane:
Subgroup plane-panning-bottom-right-pipe-b-planes:
pass -> SKIP (shard-snb)
Test kms_atomic_transition:
Subgroup plane-all-modeset-transition-fencing:
pass -> SKIP (shard-snb)
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252
Test gem_eio:
Subgroup in-flight-contexts:
pass -> DMESG-WARN (shard-snb) fdo#104058
Test gem_tiled_swapping:
Subgroup non-threaded:
incomplete -> PASS (shard-snb) fdo#104218fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058
fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218
shard-hsw total:2729 pass:1548 dwarn:1 dfail:1 fail:9 skip:1170 time:8971s shard-snb total:2729 pass:1314 dwarn:2 dfail:0 fail:11 skip:1402 time:7864s Blacklisted hosts: shard-apl total:2653 pass:1649 dwarn:1 dfail:0 fail:19 skip:983 time:13071s shard-kbl total:2729 pass:1814 dwarn:8 dfail:1 fail:25 skip:880 time:10194s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7680/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Imre Deak
As described in the WA on GLK and CNL planes on the right edge of the screen that have less than 4 pixels visible from the beginning of the plane to the edge of the screen can cause FIFO underflow and display corruption.
On GLK/CNL I could trigger the problem only if the plane was at the same time also aligned to the top edge of the screen (after clipping) and there were exactly 2 pixels visible from the start of the plane to the right edge of the screen (so couldn't trigger it with 1 or 3 pixels visible). Nevertheless, to be sure, I also applied the WA for these cases.
Quoted 8 lines
I also couldn't see any problem with the cursor plane and later Art confirmed that it's not affected, so the WA is applied only for the other plane types.
v2:
- Use-ERANGEinstead of-EINVAL. (Chris)Signed-off-by Imre Deak <[email protected]>
For both patches
Quoted 114 lines
--- drivers/gpu/drm/i915/intel_display.c | 28 ++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_drv.h | 3 ++- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_display.c +24
-4@@ -2917,14 +2917,19 @@ static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_statereturn true; } -static int skl_check_main_surface (struct intel_plane_state *plane_state) +static int skl_check_main_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) { +struct drm_i915_private *dev_priv = +to_i915 (plane_state->base.plane->dev);const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation;int x = plane_state->base.src.x1 >>16 ;int y = plane_state->base.src.y1 >>16 ;int w =drm_rect_width (&plane_state->base.src) >>16 ;int h =drm_rect_height (&plane_state->base.src) >>16 ; +int dst_x = plane_state->base.dst.x1; +int pipe_src_w = crtc_state->pipe_src_w;int max_width =skl_max_plane_width (fb,0 , rotation);int max_height =4096 ;u32 alignment, offset, aux_offset = plane_state->aux.offset;@@ -2935,6 +2940,20 @@ static int skl_check_main_surface(struct intel_plane_state *plane_state)return -EINVAL ; } +/* +* Display WA #1175: cnl,glk +* Planes other than the cursor may cause FIFO underflow and display +* corruption if starting less than 4 pixels from the right edge of +* the screen. +*/ +if ((IS_GEMINILAKE (dev_priv) ||IS_CANNONLAKE (dev_priv)) && + dst_x > pipe_src_w -4 ) { +DRM_DEBUG_KMS ("requested plane X start position %d invalid (valid range %d-%d)\n" , + dst_x, +0 , pipe_src_w -4 ); +return -ERANGE ; + } +intel_add_fb_offsets (&x, &y, plane_state,0 ); offset =intel_compute_tile_offset (&x, &y, plane_state,0 ); alignment =intel_surf_alignment (fb,0 );@@ -3067,7 +3086,8 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)return 0 ; } -int skl_check_plane_surface (struct intel_plane_state *plane_state) +int skl_check_plane_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state) {const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation;@@ -3107,7 +3127,7 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state) plane_state->aux.y =0 ; } - ret =skl_check_main_surface (plane_state); + ret =skl_check_main_surface (crtc_state, plane_state);if (ret)return ret;@@ -12766,7 +12786,7 @@ intel_check_primary_plane(struct intel_plane *plane,return 0 ;if (INTEL_GEN (dev_priv) >=9 ) { - ret =skl_check_plane_surface (state); + ret =skl_check_plane_surface (crtc_state, state);if (ret)return ret;drivers/gpu/drm/i915/intel_drv.h +2
-1@@ -1588,7 +1588,8 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state);u32 skl_plane_stride (const struct drm_framebuffer *fb,int plane,unsigned int rotation); -int skl_check_plane_surface (struct intel_plane_state *plane_state); +int skl_check_plane_surface (const struct intel_crtc_state *crtc_state, +struct intel_plane_state *plane_state);int i9xx_check_plane_surface (struct intel_plane_state *plane_state);/* intel_csr.c */ drivers/gpu/drm/i915/intel_sprite.c +1
-1@@ -1027,7 +1027,7 @@ intel_check_sprite_plane(struct intel_plane *plane, dst->y2 = crtc_y + crtc_h;if (INTEL_GEN (dev_priv) >=9 ) { - ret =skl_check_plane_surface (state); + ret =skl_check_plane_surface (crtc_state, state);if (ret)return ret;Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
In reply to PatchworkQuoted 5 lines · Patchwork
== Series Details ==
Series: series starting with [v2,1/2] drm/i915: Add display WA #1175 for planes ending close to right screen edge
URL : https://patchwork.freedesktop.org/series/36526/
State : failure
The failures look unrelated, see below.
Thanks for the review, pushed the patches to -dinq.
Quoted 6 lines
== Summary ==
Test
drv_selftest:Subgroup mock_fence: pass -> DMESG-FAIL (shard-hsw)
<7>[ 17.471678] [IGT] drv_selftest: starting subtest mock_fence <4>[ 17.498527] Setting dangerous option mock_selftests - tainting kernel <6>[ 17.511374] i915: Performing mock selftests with st_random_seed=0xe729d3f8 st_timeout=1000 <3>[ 40.720257] Timeout fence unsignaled! <3>[ 40.720444] i915/i915_sw_fence_mock_selftests: test_dma_fence failed with error -22
Quoted 8 lines
Test
kms_setmode:Subgroup basic: fail -> PASS (shard-hsw) fdo#99912 Test kms_flip: Subgroup flip-vs-fences-interruptible: dmesg-warn -> PASS (shard-hsw) fdo#102614 Subgroup vblank-vs-modeset-suspend: pass -> SKIP (shard-hsw)
rtcwake test failed with 1
Quoted 6 lines
Test
kms_frontbuffer_tracking:Subgroup fbc-1p-pri-indfb-multidraw: pass -> SKIP (shard-snb) fdo#103167 Test kms_plane: Subgroup plane-panning-bottom-right-pipe-b-planes: pass -> SKIP (shard-snb)
Test requirement not met in function test_plane_panning, file kms_plane.c:368:
Test requirement: !(connected_outs == 0)
Quoted 3 lines
Test
kms_atomic_transition:Subgroup plane-all-modeset-transition-fencing: pass -> SKIP (shard-snb)
No valid crtc/connector combinations found.
Quoted 23 lines
Test perf:
Subgroup polling: fail -> PASS (shard-hsw) fdo#102252 Test gem_eio: Subgroup in-flight-contexts: pass -> DMESG-WARN (shard-snb) fdo#104058 Test gem_tiled_swapping: Subgroup non-threaded: incomplete -> PASS (shard-snb) fdo#104218fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#104058 https://bugs.freedesktop.org/show_bug.cgi?id=104058
fdo#104218 https://bugs.freedesktop.org/show_bug.cgi?id=104218shard-hsw total:2729 pass:1548 dwarn:1 dfail:1 fail:9 skip:1170 time:8971s shard-snb total:2729 pass:1314 dwarn:2 dfail:0 fail:11 skip:1402 time:7864s Blacklisted hosts: shard-apl total:2653 pass:1649 dwarn:1 dfail:0 fail:19 skip:983 time:13071s shard-kbl total:2729 pass:1814 dwarn:8 dfail:1 fail:25 skip:880 time:10194s
Quoted 3 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7680/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx