From: Matthew Brost <matthew.brost@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: <thomas.hellstrom@linux.intel.com>,
Matthew Brost <matthew.brost@intel.com>
Subject: [PATCH v2 1/3] drm/xe: Fix xe_vma_set_pte_size
Date: Mon, 19 Feb 2024 13:19:40 -0800 [thread overview]
Message-ID: <20240219211942.3633795-2-matthew.brost@intel.com> (raw)
In-Reply-To: <20240219211942.3633795-1-matthew.brost@intel.com>
xe_vma_set_pte_size had a return value and did not set the 4k VMA flag.
Both of these were incorrect. Fix these.
Fixes: c47794bdd63d ("drm/xe: Set max pte size when skipping rebinds")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/xe/xe_vm.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 836a6e849cda..2b0c76c663e5 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2198,7 +2198,7 @@ static u64 xe_vma_max_pte_size(struct xe_vma *vma)
return SZ_1G; /* Uninitialized, used max size */
}
-static u64 xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
+static void xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
{
switch (size) {
case SZ_1G:
@@ -2207,9 +2207,10 @@ static u64 xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
case SZ_2M:
vma->gpuva.flags |= XE_VMA_PTE_2M;
break;
+ case SZ_4K:
+ vma->gpuva.flags |= XE_VMA_PTE_4K;
+ break;
}
-
- return SZ_4K;
}
static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op)
--
2.34.1
next prev parent reply other threads:[~2024-02-19 21:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 21:19 [PATCH v2 0/3] Skip remap fixes Matthew Brost
2024-02-19 21:19 ` Matthew Brost [this message]
2024-02-20 8:43 ` [PATCH v2 1/3] drm/xe: Fix xe_vma_set_pte_size Thomas Hellström
2024-02-19 21:19 ` [PATCH v2 2/3] drm/xe: Add XE_VMA_PTE_64K VMA flag Matthew Brost
2024-02-20 8:43 ` Thomas Hellström
2024-02-19 21:19 ` [PATCH v2 3/3] drm/xe: Return 2MB page size for compact 64k PTEs Matthew Brost
2024-02-20 8:44 ` Thomas Hellström
2024-02-19 22:10 ` ✓ CI.Patch_applied: success for Skip remap fixes (rev2) Patchwork
2024-02-19 22:11 ` ✗ CI.checkpatch: warning " Patchwork
2024-02-19 22:11 ` ✓ CI.KUnit: success " Patchwork
2024-02-19 22:22 ` ✓ CI.Build: " Patchwork
2024-02-19 22:23 ` ✓ CI.Hooks: " Patchwork
2024-02-19 22:25 ` ✓ CI.checksparse: " Patchwork
2024-02-19 22:45 ` ✓ CI.BAT: " Patchwork
2024-02-20 8:42 ` [PATCH v2 0/3] Skip remap fixes Thomas Hellström
2024-02-20 19:51 ` Zanoni, Paulo R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240219211942.3633795-2-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=thomas.hellstrom@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox