[igt-dev] [Intel-xe] [PATCH i-g-t 02/14] lib/gpu_cmds: Remove prefix from gen7_fill_binding_table()

[Matt Roper]

On Fri, Sep 15, 2023 at 06:23:34AM -0700, Lucas De Marchi wrote:
> This function is used by pretty much all versions. It's odd to have a
> gen7 function end up calling next-gen functions and it's error prone:
> when adding something to e.g. a gen8 function to realize that behavior
> breaks previous platforms.

Even more confusing is that we have a gen11_filling_binding_table
function as well, but Xe_HP still uses the older "gen7" variant.  Maybe
we should incorporate the gen11-specific logic into the single
fill_binding_table function as well?  It looks like it only gets used in
one path (which winds up being ICL-specific, not even used for EHL/JSL
due to lack of media samplers).


Matt

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  lib/gpu_cmds.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/gpu_cmds.c b/lib/gpu_cmds.c
> index bb35204fb..648451f74 100644
> --- a/lib/gpu_cmds.c
> +++ b/lib/gpu_cmds.c
> @@ -259,8 +259,7 @@ gen11_fill_surface_state(struct intel_bb *ibb,
>  }
>  
>  static uint32_t
> -gen7_fill_binding_table(struct intel_bb *ibb,
> -			struct intel_buf *buf)
> +fill_binding_table(struct intel_bb *ibb, struct intel_buf *buf)
>  {
>  	uint32_t binding_table_offset;
>  	uint32_t *binding_table;
> @@ -321,7 +320,7 @@ gen7_fill_interface_descriptor(struct intel_bb *ibb,
>  	uint32_t offset;
>  	uint32_t binding_table_offset, kernel_offset;
>  
> -	binding_table_offset = gen7_fill_binding_table(ibb, buf);
> +	binding_table_offset = fill_binding_table(ibb, buf);
>  	kernel_offset = gen7_fill_kernel(ibb, kernel, size);
>  
>  	intel_bb_ptr_align(ibb, 64);
> @@ -357,7 +356,7 @@ gen8_fill_interface_descriptor(struct intel_bb *ibb,
>  	uint32_t offset;
>  	uint32_t binding_table_offset, kernel_offset;
>  
> -	binding_table_offset = gen7_fill_binding_table(ibb, buf);
> +	binding_table_offset = fill_binding_table(ibb, buf);
>  	kernel_offset = gen7_fill_kernel(ibb, kernel, size);
>  
>  	intel_bb_ptr_align(ibb, 64);
> @@ -803,7 +802,7 @@ xehp_fill_interface_descriptor(struct intel_bb *ibb,
>  {
>  	uint32_t binding_table_offset, kernel_offset;
>  
> -	binding_table_offset = gen7_fill_binding_table(ibb, dst);
> +	binding_table_offset = fill_binding_table(ibb, dst);
>  	kernel_offset = gen7_fill_kernel(ibb, kernel, size);
>  
>  	memset(idd, 0, sizeof(*idd));
> -- 
> 2.40.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation