Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 54AE7EB64D9 for ; Wed, 14 Jun 2023 08:00:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F74B10E416; Wed, 14 Jun 2023 08:00:00 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9EFDB10E416 for ; Wed, 14 Jun 2023 07:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686729597; x=1718265597; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=8FCDUwl3K1CRLWVIfxkgytYiMkjL9IacQL03gWq9FCU=; b=Oz3LhHN8n7apvPGhZ9oPi8rpLqcQJYvAIpL5TWDeo4JFKFtMCi0zxLvQ rwKTGcQtui7sRruJI5KBIGGRVL32HBk2lbcUAeUVWN5ZBxDHnBkbSz0eP UzUVFrPvSUh9GP6mMFvsEUBK32ccEr+lAf3Nxd7cyMFWcJJc2+XYt2Vlb mNDETbWFUYcJuIsUo4DmzPNRS8dk+WmMnhB3gqmgmmn9/w41Jpt7Wlh0H 0+mzRJlIZ4Y5TIisyNvSHFU7ZJs5m9Ph5dNC8tPB76bgBKcPcZ2t5rID4 pzymjsmOz814x6NLvOkp7d9yGrehPSCf0F7toT7LxWa8OQoVgu+8wBhMo w==; X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="348210160" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="348210160" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 00:59:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10740"; a="958716640" X-IronPort-AV: E=Sophos;i="6.00,242,1681196400"; d="scan'208";a="958716640" Received: from aryba-mobl.ger.corp.intel.com (HELO [10.249.254.20]) ([10.249.254.20]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 00:59:54 -0700 Message-ID: <718c03d8-edb4-e381-9d9b-f4e3c58730df@linux.intel.com> Date: Wed, 14 Jun 2023 09:59:52 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: Matthew Brost , intel-xe@lists.freedesktop.org References: <20230608050333.37581-1-matthew.brost@intel.com> <20230608050333.37581-2-matthew.brost@intel.com> From: =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= In-Reply-To: <20230608050333.37581-2-matthew.brost@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-xe] [PATCH 1/3] drm/xe: s/XE_PTE_READ_ONLY/XE_PTE_FLAG_READ_ONLY X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 6/8/23 07:03, Matthew Brost wrote: > This define is for internal PTE flags rather than fields in the hardware > PTEs, rename as such. This will help in an upcoming patch to avoid > further confusion. > > Signed-off-by: Matthew Brost Reviewed-by: Thomas Hellström > --- > drivers/gpu/drm/xe/xe_bo.h | 2 +- > drivers/gpu/drm/xe/xe_pt.c | 2 +- > drivers/gpu/drm/xe/xe_vm.c | 12 +++++++----- > 3 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_bo.h b/drivers/gpu/drm/xe/xe_bo.h > index 29eb7474f018..552fe073e9c5 100644 > --- a/drivers/gpu/drm/xe/xe_bo.h > +++ b/drivers/gpu/drm/xe/xe_bo.h > @@ -65,7 +65,7 @@ > #define XE_PAGE_PRESENT BIT_ULL(0) > #define XE_PAGE_RW BIT_ULL(1) > > -#define XE_PTE_READ_ONLY BIT(0) > +#define XE_PTE_FLAG_READ_ONLY BIT(0) > > #define XE_PL_SYSTEM TTM_PL_SYSTEM > #define XE_PL_TT TTM_PL_TT > diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c > index bef265715000..39ec94549439 100644 > --- a/drivers/gpu/drm/xe/xe_pt.c > +++ b/drivers/gpu/drm/xe/xe_pt.c > @@ -102,7 +102,7 @@ static u64 __gen8_pte_encode(u64 pte, enum xe_cache_level cache, u32 flags, > { > pte |= XE_PAGE_PRESENT | XE_PAGE_RW; > > - if (unlikely(flags & XE_PTE_READ_ONLY)) > + if (unlikely(flags & XE_PTE_FLAG_READ_ONLY)) > pte &= ~XE_PAGE_RW; > > /* FIXME: I don't think the PPAT handling is correct for MTL */ > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > index d1c380ad7f6b..94fc9c330235 100644 > --- a/drivers/gpu/drm/xe/xe_vm.c > +++ b/drivers/gpu/drm/xe/xe_vm.c > @@ -61,7 +61,7 @@ int xe_vma_userptr_pin_pages(struct xe_vma *vma) > bool in_kthread = !current->mm; > unsigned long notifier_seq; > int pinned, ret, i; > - bool read_only = vma->pte_flags & XE_PTE_READ_ONLY; > + bool read_only = vma->pte_flags & XE_PTE_FLAG_READ_ONLY; > > lockdep_assert_held(&vm->lock); > XE_BUG_ON(!xe_vma_is_userptr(vma)); > @@ -869,7 +869,7 @@ static struct xe_vma *xe_vma_create(struct xe_vm *vm, > vma->start = start; > vma->end = end; > if (read_only) > - vma->pte_flags = XE_PTE_READ_ONLY; > + vma->pte_flags = XE_PTE_FLAG_READ_ONLY; > > if (tile_mask) { > vma->tile_mask = tile_mask; > @@ -923,7 +923,7 @@ static void xe_vma_destroy_late(struct xe_vma *vma) > { > struct xe_vm *vm = vma->vm; > struct xe_device *xe = vm->xe; > - bool read_only = vma->pte_flags & XE_PTE_READ_ONLY; > + bool read_only = vma->pte_flags & XE_PTE_FLAG_READ_ONLY; > > if (xe_vma_is_userptr(vma)) { > if (vma->userptr.sg) { > @@ -2641,7 +2641,8 @@ static struct xe_vma *vm_unbind_lookup_vmas(struct xe_vm *vm, > first->userptr.ptr, > first->start, > lookup->start - 1, > - (first->pte_flags & XE_PTE_READ_ONLY), > + (first->pte_flags & > + XE_PTE_FLAG_READ_ONLY), > first->tile_mask); > if (first->bo) > xe_bo_unlock(first->bo, &ww); > @@ -2672,7 +2673,8 @@ static struct xe_vma *vm_unbind_lookup_vmas(struct xe_vm *vm, > last->userptr.ptr + chunk, > last->start + chunk, > last->end, > - (last->pte_flags & XE_PTE_READ_ONLY), > + (last->pte_flags & > + XE_PTE_FLAG_READ_ONLY), > last->tile_mask); > if (last->bo) > xe_bo_unlock(last->bo, &ww);