[Intel-xe] [PATCH 26/37] Revert "drm/xe: Validate BO on CPU fault"

[Rodrigo Vivi]

On Thu, Jan 12, 2023 at 05:25:27PM -0500, Rodrigo Vivi wrote:
> From: Matthew Brost <matthew.brost at intel.com>
> 
> This reverts commit 48d84660be7607ccaacd76a2d653f51709cc5693.

Hi Matt, this commit doesn't exist after the big squased initial patch.
Could you please reply here with a commit subject and message?
I will add on a next interaction or when merging it.

Thanks,
Rodrigo.

> 
> Cc: Matthew Brost <matthew.brost at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_bo.c | 13 ++++++-------
>  1 file changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
> index da2c8a1c19ec..e224405bc4f6 100644
> --- a/drivers/gpu/drm/xe/xe_bo.c
> +++ b/drivers/gpu/drm/xe/xe_bo.c
> @@ -875,14 +875,13 @@ static vm_fault_t xe_gem_fault(struct vm_fault *vmf)
>  
>  		trace_xe_bo_cpu_fault(bo);
>  
> -		if (should_migrate_to_system(bo))
> +		if (should_migrate_to_system(bo)) {
>  			r = xe_bo_migrate(bo, XE_PL_TT);
> -		else
> -			r = xe_bo_validate(bo, NULL, false);
> -		if (r == -EBUSY || r == -ERESTARTSYS)
> -			ret = VM_FAULT_NOPAGE;
> -		else if (r)
> -			ret = VM_FAULT_SIGBUS;
> +			if (r == -EBUSY || r == -ERESTARTSYS || r == -EINTR)
> +				ret = VM_FAULT_NOPAGE;
> +			else if (r)
> +				ret = VM_FAULT_SIGBUS;
> +		}
>  		if (!ret)
>  			ret = ttm_bo_vm_fault_reserved(vmf,
>  						       vmf->vma->vm_page_prot,
> -- 
> 2.38.1
>