[PATCH i-g-t,v5 1/5] lib/intel_blt: Promote MEM_COPY_MOCS_SHIFT

[Zbigniew Kempczyński]

On Wed, Apr 02, 2025 at 01:49:59PM +0200, Francois Dugast wrote:
> Move MEM_COPY_MOCS_SHIFT to the header to use it elsewhere without code
> duplication. Add XE2_ prefix to make purpose clearer.
> 
> Signed-off-by: Francois Dugast <francois.dugast at intel.com>

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>

--
Zbigniew

> ---
>  lib/intel_blt.c | 3 +--
>  lib/intel_blt.h | 1 +
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/intel_blt.c b/lib/intel_blt.c
> index b2fb3151e..7010d3ff7 100644
> --- a/lib/intel_blt.c
> +++ b/lib/intel_blt.c
> @@ -21,7 +21,6 @@
>  
>  #define BITRANGE(start, end) (end - start + 1)
>  #define GET_CMDS_INFO(__fd) intel_get_cmds_info(intel_get_drm_devid(__fd))
> -#define MEM_COPY_MOCS_SHIFT                     25
>  
>  /* Blitter tiling definitions sanity checks */
>  static_assert(T_LINEAR == I915_TILING_NONE, "Linear definitions have to match");
> @@ -1840,7 +1839,7 @@ static void emit_blt_mem_copy(int fd, uint64_t ahnd, const struct blt_mem_data *
>  	batch[i++] = src_offset << 32;
>  	batch[i++] = dst_offset;
>  	batch[i++] = dst_offset << 32;
> -	batch[i++] = mem->src.mocs_index << MEM_COPY_MOCS_SHIFT | mem->dst.mocs_index;
> +	batch[i++] = mem->src.mocs_index << XE2_MEM_COPY_MOCS_SHIFT | mem->dst.mocs_index;
>  	batch[i++] = MI_BATCH_BUFFER_END;
>  
>  	munmap(batch, mem->bb.size);
> diff --git a/lib/intel_blt.h b/lib/intel_blt.h
> index 5d6191ac9..4bae0b47b 100644
> --- a/lib/intel_blt.h
> +++ b/lib/intel_blt.h
> @@ -53,6 +53,7 @@
>  #include "intel_cmds_info.h"
>  
>  #define CCS_RATIO(fd) (intel_gen(intel_get_drm_devid(fd)) >= 20 ? 512 : 256)
> +#define XE2_MEM_COPY_MOCS_SHIFT                     25
>  
>  enum blt_color_depth {
>  	CD_8bit,
> -- 
> 2.43.0
>