[igt-dev] [PATCH i-g-t] lib/xe_query: Recover original vram_* macros semantics

[Matthew Brost]

On Mon, Mar 20, 2023 at 05:32:59PM +0100, Zbigniew Kempczyński wrote:
> On multi tile vram_possible() semantics was changed what was wrong
> and must be recover.
> 
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>

This works for now to fix PVC and all current platforms but at some
point this will break if media GTs have VRAM.

Let's properly fix this in a follow up but for now this works.

With that:
Reviewed-by: Matthew Brost <matthew.brost at intel.com>

> ---
>  lib/xe/xe_query.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c
> index 1835232804..4598c0d5a1 100644
> --- a/lib/xe/xe_query.c
> +++ b/lib/xe/xe_query.c
> @@ -356,13 +356,9 @@ uint64_t system_memory(int fd)
>   */
>  uint64_t vram_memory(int fd, int gt)
>  {
> -	struct xe_device *xe_dev;
> -
> -	xe_dev = find_in_cache(fd);
> -	igt_assert(xe_dev);
> -	igt_assert(gt >= 0 && gt < xe_dev->number_gt);
> +	uint64_t regions = all_memory_regions(fd);
>  
> -	return native_region_for_gt(xe_dev->gts, gt);
> +	return regions & (0x2 << gt);
>  }
>  
>  /**
> @@ -375,11 +371,10 @@ uint64_t vram_memory(int fd, int gt)
>   */
>  uint64_t vram_if_possible(int fd, int gt)
>  {
> -	uint64_t regions = all_memory_regions(fd);
> -	uint64_t system_memory = regions & 0x1;
> -	uint64_t vram = regions & (~0x1);
> +	uint64_t smemory = system_memory(fd);
> +	uint64_t vram = vram_memory(fd, gt);
>  
> -	return vram ? vram : system_memory;
> +	return vram ? vram : smemory;
>  }
>  
>  /**
> -- 
> 2.34.1
>