[igt-dev] [PATCH i-g-t 4/9] lib/igt_fb: Switch from XY_FAST_COPY_BLT to XY_SRC_COPY_BLT

[Chris Wilson]

Quoting Imre Deak (2020-01-29 18:15:56)
> From: Vanshidhar Konda <vanshidhar.r.konda at intel.com>
> 
> The XY_SRC_COPY_BLT instruction is supported on more platforms than
> XY_FAST_COPY_BLT - use it for X tiling on GEN12+ copying using blitter.
> For other tiling modes/platforms use the XY_FAST_COPY_BLT as before.
> 
> v2:
> - Use xy_src blit only - when necessary - on GEN12+/X-tiled mods.
> 
> Signed-off-by: Vanshidhar Konda <vanshidhar.r.konda at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> ---
>  lib/igt_fb.c | 59 +++++++++++++++++++++++++++++++++++++++-------------
>  1 file changed, 45 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/igt_fb.c b/lib/igt_fb.c
> index ec7e9991..53b43528 100644
> --- a/lib/igt_fb.c
> +++ b/lib/igt_fb.c
> @@ -2146,27 +2146,58 @@ static void copy_with_engine(struct fb_blit_upload *blit,
>  static void blitcopy(const struct igt_fb *dst_fb,
>                      const struct igt_fb *src_fb)
>  {
> +       uint32_t src_tiling, dst_tiling;
> +
>         igt_assert_eq(dst_fb->fd, src_fb->fd);
>         igt_assert_eq(dst_fb->num_planes, src_fb->num_planes);
>  
> +       src_tiling = igt_fb_mod_to_tiling(src_fb->modifier);
> +       dst_tiling = igt_fb_mod_to_tiling(dst_fb->modifier);
> +
>         for (int i = 0; i < dst_fb->num_planes; i++) {
> +               int gen = intel_gen(intel_get_drm_devid(src_fb->fd));
> +
>                 igt_assert_eq(dst_fb->plane_bpp[i], src_fb->plane_bpp[i]);
>                 igt_assert_eq(dst_fb->plane_width[i], src_fb->plane_width[i]);
>                 igt_assert_eq(dst_fb->plane_height[i], src_fb->plane_height[i]);
> -
> -               igt_blitter_fast_copy__raw(dst_fb->fd,
> -                                          src_fb->gem_handle,
> -                                          src_fb->offsets[i],
> -                                          src_fb->strides[i],
> -                                          igt_fb_mod_to_tiling(src_fb->modifier),
> -                                          0, 0, /* src_x, src_y */
> -                                          dst_fb->plane_width[i], dst_fb->plane_height[i],
> -                                          dst_fb->plane_bpp[i],
> -                                          dst_fb->gem_handle,
> -                                          dst_fb->offsets[i],
> -                                          dst_fb->strides[i],
> -                                          igt_fb_mod_to_tiling(dst_fb->modifier),
> -                                          0, 0 /* dst_x, dst_y */);
> +               /*
> +                * On GEN12+ X-tiled format support is removed from the fast
> +                * blit command, so use the XY_SRC blit command for it
> +                * instead.
> +                */

Just use the normal SRC_COPY for linear/X/Y, keep it simple?
-Chris