[PATCH v2 2/3] drm/xe: Add XE_VMA_PTE_64K VMA flag

[Thomas Hellström]

On Mon, 2024-02-19 at 13:19 -0800, Matthew Brost wrote:
> Add XE_VMA_PTE_64K VMA flag to ensure skipping rebinds does not cross
> 64k page boundaries.
> 
> Fixes: 8f33b4f054fc ("drm/xe: Avoid doing rebinds")
> Fixes: c47794bdd63d ("drm/xe: Set max pte size when skipping
> rebinds")
> Signed-off-by: Matthew Brost <matthew.brost at intel.com>

Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>


> ---
>  drivers/gpu/drm/xe/xe_pt.c       | 6 ++++--
>  drivers/gpu/drm/xe/xe_vm.c       | 5 +++++
>  drivers/gpu/drm/xe/xe_vm_types.h | 1 +
>  3 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c
> index 1e35c7525447..46cea37bdac5 100644
> --- a/drivers/gpu/drm/xe/xe_pt.c
> +++ b/drivers/gpu/drm/xe/xe_pt.c
> @@ -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.
>  		 */
>  		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;
> -			else if (XE_WARN_ON(xe_walk->needs_64K))
> +			} else if (XE_WARN_ON(xe_walk->needs_64K)) {
>  				return -EINVAL;
> +			}
>  		}
>  
>  		ret = xe_pt_insert_entry(xe_walk, xe_parent, offset,
> NULL, pte);
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index 2b0c76c663e5..7781290d2b99 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -2192,6 +2192,8 @@ static u64 xe_vma_max_pte_size(struct xe_vma
> *vma)
>  		return SZ_1G;
>  	else if (vma->gpuva.flags & XE_VMA_PTE_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)
>  		return SZ_4K;
>  
> @@ -2207,6 +2209,9 @@ static void xe_vma_set_pte_size(struct xe_vma
> *vma, u64 size)
>  	case SZ_2M:
>  		vma->gpuva.flags |= XE_VMA_PTE_2M;
>  		break;
> +	case SZ_64K:
> +		vma->gpuva.flags |= XE_VMA_PTE_64K;
> +		break;
>  	case SZ_4K:
>  		vma->gpuva.flags |= XE_VMA_PTE_4K;
>  		break;
> diff --git a/drivers/gpu/drm/xe/xe_vm_types.h
> b/drivers/gpu/drm/xe/xe_vm_types.h
> index 5ac9c5bebabc..91800ce70845 100644
> --- a/drivers/gpu/drm/xe/xe_vm_types.h
> +++ b/drivers/gpu/drm/xe/xe_vm_types.h
> @@ -29,6 +29,7 @@ struct xe_vm;
>  #define XE_VMA_PTE_4K		(DRM_GPUVA_USERBITS << 5)
>  #define XE_VMA_PTE_2M		(DRM_GPUVA_USERBITS << 6)
>  #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 {