diff options
| author | Matthew Brost <matthew.brost@intel.com> | 2024-02-19 13:19:40 -0800 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2024-02-21 10:29:26 +0100 |
| commit | ecfac05f962f3aa567ae1796b2586a64fb97fe24 (patch) | |
| tree | 8e1bfb37ec89ec414e1210280d0621cbdc323883 | |
| parent | 77aebae1ea12de6eae5ce70d05b3d4724eec4023 (diff) | |
| download | linux-ecfac05f962f3aa567ae1796b2586a64fb97fe24.tar.gz | |
drm/xe: Fix xe_vma_set_pte_size
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>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240219211942.3633795-2-matthew.brost@intel.com
(cherry picked from commit 19adaccef8b246182dc89a7470aa7758245efd5d)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Notes
Fixes: c47794bdd63d ("drm/xe: Set max pte size when skipping rebinds") # v6.8-rc1
Lore: https://lore.kernel.org/r/20240219211616.3633630-2-matthew.brost@intel.com # intel-xe
Lore: https://lore.kernel.org/r/20240219211942.3633795-2-matthew.brost@intel.com # intel-xe
| -rw-r--r-- | drivers/gpu/drm/xe/xe_vm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 7b00faa672879c..0007448aa18981 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) |