[igt-dev] [PATCH i-g-t 2/4] lib/intel_batchbuffer: Enable XY_FAST_COPY_BLT support for api_intel_bb

[Karolina Stolarek]

Hi Vikas,

Thank you for your patches. Hope you don't mind a couple of comments -- 
your work here is strongly connected to the changes I merged this week, 
and I think it would be good to reuse some of the solutions I proposed 
there.

First suggestion -- could you add a cover letter to this series? It 
would be good to provide some background for your changes. Even saying 
that it's for enabling these test on MTL would be helpful.

On 12.03.2023 20:04, Vikas Srivastava wrote:
> Test case uses legacy command XY_SRC_COPY_BLT_CMD which is not supported
> starting from PVC. Modified test to use XY_FAST_COPY_BLT.

I think it would be better to reword it to say "newer platforms", as it 
targets other platforms like MTL. Could we also say that it's for 
intel_bb initialization? I believe I saw a very similar commit 
description earlier...

> 
> Signed-off-by: Vikas Srivastava <vikas.srivastava at intel.com>
> ---
>   lib/intel_batchbuffer.c | 54 ++++++++++++++++++++++++++---------------
>   1 file changed, 34 insertions(+), 20 deletions(-)
> 
> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> index 8695f1b7ac..dae49ee1bc 100644
> --- a/lib/intel_batchbuffer.c
> +++ b/lib/intel_batchbuffer.c
> @@ -2339,11 +2339,15 @@ uint32_t intel_bb_copy_data(struct intel_bb *ibb,
>    */
>   void intel_bb_blit_start(struct intel_bb *ibb, uint32_t flags)
>   {
> -	intel_bb_out(ibb, XY_SRC_COPY_BLT_CMD |
> -		     XY_SRC_COPY_BLT_WRITE_ALPHA |
> -		     XY_SRC_COPY_BLT_WRITE_RGB |
> -		     flags |
> -		     (6 + 2 * (ibb->gen >= 8)));
> +	if (intel_graphics_ver(ibb->devid) >= IP_VER(12, 60))
> +		intel_bb_out(ibb, XY_FAST_COPY_BLT | flags);
> +	else
> +
> +		intel_bb_out(ibb, XY_SRC_COPY_BLT_CMD |
> +			     XY_SRC_COPY_BLT_WRITE_ALPHA |
> +			     XY_SRC_COPY_BLT_WRITE_RGB |
> +			     flags |
> +			     (6 + 2 * (ibb->gen >= 8)));
>   }

suggestion: As my intel_batchbuffer.c changes are merged, you can now 
use i915_blt library and check for xy_src_copy/fast_copy. What about 
rewriting the patch to check for supported blit commands? For example, 
see my changes here:

https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/blob/2ef32bfac589c5d413357c4be52b96d78f4131e1/tests/i915/gem_blits.c#L215-L232

The comment applies to two changes below as well.

>   
>   /*
> @@ -2381,12 +2385,18 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb,
>   
>   	if (gen >= 4 && src->tiling != I915_TILING_NONE) {
>   		src_pitch /= 4;
> -		cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED;
> +		if (intel_graphics_ver(ibb->devid) >= IP_VER(12, 60))
> +			cmd_bits |= fast_copy_dword0(src->tiling, dst->tiling);
> +		else
> +			cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED;
>   	}
>   
>   	if (gen >= 4 && dst->tiling != I915_TILING_NONE) {
>   		dst_pitch /= 4;
> -		cmd_bits |= XY_SRC_COPY_BLT_DST_TILED;
> +		if (intel_graphics_ver(ibb->devid) >= IP_VER(12, 60))
> +			cmd_bits |= fast_copy_dword0(src->tiling, dst->tiling);
> +		else
> +			cmd_bits |= XY_SRC_COPY_BLT_DST_TILED;
>   	}
>   
>   	CHECK_RANGE(src_x1); CHECK_RANGE(src_y1);
> @@ -2397,19 +2407,23 @@ void intel_bb_emit_blt_copy(struct intel_bb *ibb,
>   	CHECK_RANGE(src_pitch); CHECK_RANGE(dst_pitch);
>   
>   	br13_bits = 0;
> -	switch (bpp) {
> -	case 8:
> -		break;
> -	case 16:		/* supporting only RGB565, not ARGB1555 */
> -		br13_bits |= 1 << 24;
> -		break;
> -	case 32:
> -		br13_bits |= 3 << 24;
> -		cmd_bits |= (XY_SRC_COPY_BLT_WRITE_ALPHA |
> -			     XY_SRC_COPY_BLT_WRITE_RGB);
> -		break;
> -	default:
> -		igt_fail(IGT_EXIT_FAILURE);
> +	if (intel_graphics_ver(ibb->devid) < IP_VER(12, 60)) {
> +		switch (bpp) {
> +		case 8:
> +			break;
> +		case 16:		/* supporting only RGB565, not ARGB1555 */
> +			br13_bits |= 1 << 24;
> +			break;
> +		case 32:
> +			br13_bits |= 3 << 24;
> +			cmd_bits |= (XY_SRC_COPY_BLT_WRITE_ALPHA |
> +				     XY_SRC_COPY_BLT_WRITE_RGB);
> +			break;
> +		default:
> +			igt_fail(IGT_EXIT_FAILURE);
> +		}
> +	} else {
> +		br13_bits = fast_copy_dword1(src->tiling, dst->tiling, bpp);

This change won't compile on the newest IGTs. Could you rebase your 
patches and make sure that each of them compiles?

All the best,
Karolina

>   	}
>   
>   	if ((src->tiling | dst->tiling) >= I915_TILING_Y) {