[igt-dev] [RFC v1 13/20] drm/xe_query: Remove backward compatibility of vram_visible_size.

[Kamil Konieczny]

Hi Francois,
On 2023-10-11 at 14:18:34 +0000, Francois Dugast wrote:

same here, remove dot from end of subject:

[RFC v1 13/20] drm/xe_query: Remove backward compatibility of vram_visible_size.
s/vram_visible_size./vram_visible_size/

Regards,
Kamil

> From: Rodrigo Vivi <rodrigo.vivi at intel.com>
> 
> We are breaking the uapi compatibility at this time, so this
> is useless anyway.
> 
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  lib/xe/xe_query.c | 42 +++++++-----------------------------------
>  1 file changed, 7 insertions(+), 35 deletions(-)
> 
> diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> index 76e245f9c..87841e8a3 100644
> --- a/lib/xe/xe_query.c
> +++ b/lib/xe/xe_query.c
> @@ -397,16 +397,6 @@ uint64_t vram_memory(int fd, int gt)
>  	return xe_has_vram(fd) ? native_region_for_gt(xe_dev->gt_list, gt) : 0;
>  }
>  
> -static uint64_t __xe_visible_vram_size(int fd, int gt)
> -{
> -	struct xe_device *xe_dev;
> -
> -	xe_dev = find_in_cache(fd);
> -	igt_assert(xe_dev);
> -
> -	return xe_dev->visible_vram_size[gt];
> -}
> -
>  /**
>   * visible_vram_memory:
>   * @fd: xe device fd
> @@ -418,14 +408,7 @@ static uint64_t __xe_visible_vram_size(int fd, int gt)
>   */
>  uint64_t visible_vram_memory(int fd, int gt)
>  {
> -	/*
> -	 * TODO: Keep it backwards compat for now. Fixup once the kernel side
> -	 * has landed.
> -	 */
> -	if (__xe_visible_vram_size(fd, gt))
> -		return vram_memory(fd, gt) | DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM;
> -	else
> -		return vram_memory(fd, gt); /* older kernel */
> +	return vram_memory(fd, gt) | DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM;
>  }
>  
>  /**
> @@ -457,14 +440,7 @@ uint64_t visible_vram_if_possible(int fd, int gt)
>  	uint64_t system_memory = regions & 0x1;
>  	uint64_t vram = regions & (0x2 << gt);
>  
> -	/*
> -	 * TODO: Keep it backwards compat for now. Fixup once the kernel side
> -	 * has landed.
> -	 */
> -	if (__xe_visible_vram_size(fd, gt))
> -		return vram ? vram | DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM : system_memory;
> -	else
> -		return vram ? vram : system_memory; /* older kernel */
> +	return vram ? vram | DRM_XE_GEM_CREATE_FLAG_NEEDS_VISIBLE_VRAM : system_memory;
>  }
>  
>  /**
> @@ -616,18 +592,14 @@ uint64_t xe_vram_size(int fd, int gt)
>   */
>  uint64_t xe_visible_vram_size(int fd, int gt)
>  {
> -	uint64_t visible_size;
> +	struct xe_device *xe_dev;
>  
> -	/*
> -	 * TODO: Keep it backwards compat for now. Fixup once the kernel side
> -	 * has landed.
> -	 */
> -	visible_size = __xe_visible_vram_size(fd, gt);
> -	if (!visible_size) /* older kernel */
> -		visible_size = xe_vram_size(fd, gt);
> +	xe_dev = find_in_cache(fd);
> +	igt_assert(xe_dev);
>  
> -	return visible_size;
> +	return xe_dev->visible_vram_size[gt];
>  }
> +
>  /**
>   * xe_vram_available:
>   * @fd: xe device fd
> -- 
> 2.34.1
>