From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8082310E2A2 for ; Thu, 6 Apr 2023 16:38:56 +0000 (UTC) Date: Thu, 6 Apr 2023 09:38:32 -0700 From: Niranjana Vishwanathapura To: Matthew Auld Message-ID: References: <20230406082157.258722-1-matthew.auld@intel.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230406082157.258722-1-matthew.auld@intel.com> MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t v2] lib/xe_query: fix vram_memory() and vram_if_possible() List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Thu, Apr 06, 2023 at 09:21:57AM +0100, Matthew Auld wrote: >vram_memory() is meant to return VRAM if supported. If we call this on >igpu it should return zero. There is at least one user relying on this >in xe_mmap@vram, where we want to skip if the mask here is zero. > >vram_if_possible() should account for the per GT VRAM when returning >the mask. Currently it just returns the mask for all VRAM instances. > >v2 (Niranjana): > - Squash into a single patch > - Fold in the differences from the version by Matt Brost & Zbigniew > LGTM. Reviewed-by: Niranjana Vishwanathapura >Reported-by: Gwan-gyeong Mun >Signed-off-by: Matthew Auld >Cc: Niranjana Vishwanathapura >Cc: Zbigniew Kempczyński >Cc: Matthew Brost >--- > lib/xe/xe_query.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > >diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c >index 24a258a5e..2b627a78a 100644 >--- a/lib/xe/xe_query.c >+++ b/lib/xe/xe_query.c >@@ -380,7 +380,7 @@ uint64_t vram_memory(int fd, int gt) > igt_assert(xe_dev); > igt_assert(gt >= 0 && gt < xe_dev->number_gt); > >- return native_region_for_gt(xe_dev->gts, gt); >+ return xe_has_vram(fd) ? native_region_for_gt(xe_dev->gts, gt) : 0; > } > > /** >@@ -393,11 +393,7 @@ 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); >- >- return vram ? vram : system_memory; >+ return vram_memory(fd, gt) ?: system_memory(fd); > } > > /** >-- >2.39.2 >