Commit 15f0e0c2 authored by Matthew Brost's avatar Matthew Brost

drm/xe: Add XE_VMA_PTE_64K VMA flag

Add XE_VMA_PTE_64K VMA flag to ensure skipping rebinds does not cross
64k page boundaries.

Fixes: 8f33b4f0 ("drm/xe: Avoid doing rebinds")
Fixes: c47794bd ("drm/xe: Set max pte size when skipping rebinds")
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240219211942.3633795-3-matthew.brost@intel.com
parent 19adacce
...@@ -499,10 +499,12 @@ xe_pt_stage_bind_entry(struct xe_ptw *parent, pgoff_t offset, ...@@ -499,10 +499,12 @@ xe_pt_stage_bind_entry(struct xe_ptw *parent, pgoff_t offset,
* this device *requires* 64K PTE size for VRAM, fail. * this device *requires* 64K PTE size for VRAM, fail.
*/ */
if (level == 0 && !xe_parent->is_compact) { if (level == 0 && !xe_parent->is_compact) {
if (xe_pt_is_pte_ps64K(addr, next, xe_walk)) if (xe_pt_is_pte_ps64K(addr, next, xe_walk)) {
xe_walk->vma->gpuva.flags |= XE_VMA_PTE_64K;
pte |= XE_PTE_PS64; pte |= XE_PTE_PS64;
else if (XE_WARN_ON(xe_walk->needs_64K)) } else if (XE_WARN_ON(xe_walk->needs_64K)) {
return -EINVAL; return -EINVAL;
}
} }
ret = xe_pt_insert_entry(xe_walk, xe_parent, offset, NULL, pte); ret = xe_pt_insert_entry(xe_walk, xe_parent, offset, NULL, pte);
......
...@@ -2192,6 +2192,8 @@ static u64 xe_vma_max_pte_size(struct xe_vma *vma) ...@@ -2192,6 +2192,8 @@ static u64 xe_vma_max_pte_size(struct xe_vma *vma)
return SZ_1G; return SZ_1G;
else if (vma->gpuva.flags & XE_VMA_PTE_2M) else if (vma->gpuva.flags & XE_VMA_PTE_2M)
return SZ_2M; return SZ_2M;
else if (vma->gpuva.flags & XE_VMA_PTE_64K)
return SZ_64K;
else if (vma->gpuva.flags & XE_VMA_PTE_4K) else if (vma->gpuva.flags & XE_VMA_PTE_4K)
return SZ_4K; return SZ_4K;
...@@ -2207,6 +2209,9 @@ static void xe_vma_set_pte_size(struct xe_vma *vma, u64 size) ...@@ -2207,6 +2209,9 @@ static void xe_vma_set_pte_size(struct xe_vma *vma, u64 size)
case SZ_2M: case SZ_2M:
vma->gpuva.flags |= XE_VMA_PTE_2M; vma->gpuva.flags |= XE_VMA_PTE_2M;
break; break;
case SZ_64K:
vma->gpuva.flags |= XE_VMA_PTE_64K;
break;
case SZ_4K: case SZ_4K:
vma->gpuva.flags |= XE_VMA_PTE_4K; vma->gpuva.flags |= XE_VMA_PTE_4K;
break; break;
......
...@@ -29,6 +29,7 @@ struct xe_vm; ...@@ -29,6 +29,7 @@ struct xe_vm;
#define XE_VMA_PTE_4K (DRM_GPUVA_USERBITS << 5) #define XE_VMA_PTE_4K (DRM_GPUVA_USERBITS << 5)
#define XE_VMA_PTE_2M (DRM_GPUVA_USERBITS << 6) #define XE_VMA_PTE_2M (DRM_GPUVA_USERBITS << 6)
#define XE_VMA_PTE_1G (DRM_GPUVA_USERBITS << 7) #define XE_VMA_PTE_1G (DRM_GPUVA_USERBITS << 7)
#define XE_VMA_PTE_64K (DRM_GPUVA_USERBITS << 8)
/** struct xe_userptr - User pointer */ /** struct xe_userptr - User pointer */
struct xe_userptr { struct xe_userptr {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment