Skip to content

Commit ecfac05

Browse files
mbrost05Thomas Hellström
authored andcommitted
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: c47794b ("drm/xe: Set max pte size when skipping rebinds") Signed-off-by: Matthew Brost <[email protected]> Reviewed-by: Thomas Hellström <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 19adacc) Signed-off-by: Thomas Hellström <[email protected]>
1 parent 77aebae commit ecfac05

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/gpu/drm/xe/xe_vm.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2198,7 +2198,7 @@ static u64 xe_vma_max_pte_size(struct xe_vma *vma)
21982198
return SZ_1G; /* Uninitialized, used max size */
21992199
}
22002200

2201-
static u64 xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
2201+
static void xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
22022202
{
22032203
switch (size) {
22042204
case SZ_1G:
@@ -2207,9 +2207,10 @@ static u64 xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
22072207
case SZ_2M:
22082208
vma->gpuva.flags |= XE_VMA_PTE_2M;
22092209
break;
2210+
case SZ_4K:
2211+
vma->gpuva.flags |= XE_VMA_PTE_4K;
2212+
break;
22102213
}
2211-
2212-
return SZ_4K;
22132214
}
22142215

22152216
static int xe_vma_op_commit(struct xe_vm *vm, struct xe_vma_op *op)

0 commit comments

Comments
 (0)