On Thu, Feb 23, 2023 at 10:39:54AM -0800, Jonathan Cavitt wrote: > Refactor the supports_x_tiling and fast_blit_ok helper > functions in the live client selftest to better reflect > when XY_FAST_COPY_BLT supports X-tile and can be used. > > Signed-off-by: Jonathan Cavitt <[email protected]>
Bspec: 47982 Reviewed-by: Matt Roper <[email protected]> > --- > .../i915/gem/selftests/i915_gem_client_blt.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c > b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c > index 3bb1f7f0110e..ff81af4c8202 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c > @@ -108,31 +108,30 @@ struct tiled_blits { > u32 height; > }; > > -static bool supports_x_tiling(const struct drm_i915_private *i915) > +static bool fastblit_supports_x_tiling(const struct drm_i915_private *i915) > { > int gen = GRAPHICS_VER(i915); > > + /* XY_FAST_COPY_BLT does not exist on pre-gen9 platforms */ > + drm_WARN_ON(&i915->drm, gen < 9); > + > if (gen < 12) > return true; > > - if (!HAS_LMEM(i915) || IS_DG1(i915)) > + if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) > return false; > > - return true; > + return HAS_DISPLAY(i915); > } > > static bool fast_blit_ok(const struct blit_buffer *buf) > { > - int gen = GRAPHICS_VER(buf->vma->vm->i915); > - > - if (gen < 9) > + /* XY_FAST_COPY_BLT does not exist on pre-gen9 platforms */ > + if (GRAPHICS_VER(buf->vma->vm->i915) < 9) > return false; > > - if (gen < 12) > - return true; > - > /* filter out platforms with unsupported X-tile support in fastblit */ > - if (buf->tiling == CLIENT_TILING_X && > !supports_x_tiling(buf->vma->vm->i915)) > + if (buf->tiling == CLIENT_TILING_X && > !fastblit_supports_x_tiling(buf->vma->vm->i915)) > return false; > > return true; > -- > 2.25.1 > -- Matt Roper Graphics Software Engineer Linux GPU Platform Enablement Intel Corporation
