| Message ID | 20180116112415.22060-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 16, 2018 at 01:24:14PM +0200, Imre Deak wrote: > 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) > > Signed-off-by: Imre Deak <imre.deak@intel.com> For both patches Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > 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(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 221e3a183d36..7fe1592bf0df 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2917,14 +2917,19 @@ static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state > return 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; > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 5c8e260ca2bc..0f2356d84d0d 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -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 */ > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index dd485f59eb1d..b8b617ba0c0c 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -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; > > -- > 2.13.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Jan 16, 2018 at 02:05:30PM +0000, Patchwork wrote: > == 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. > > == 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 > 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 > 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) > Test kms_atomic_transition: > Subgroup plane-all-modeset-transition-fencing: > pass -> SKIP (shard-snb) No valid crtc/connector combinations found. > 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#104218 > > fdo#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
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 221e3a183d36..7fe1592bf0df 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2917,14 +2917,19 @@ static bool skl_check_main_ccs_coordinates(struct intel_plane_state *plane_state return 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; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5c8e260ca2bc..0f2356d84d0d 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -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 */ diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index dd485f59eb1d..b8b617ba0c0c 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -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;
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) Signed-off-by: Imre Deak <imre.deak@intel.com> --- 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(-)