[Intel-xe] [PATCH 2/7] drm/xe/vm: Prefer xe_assert() over XE_WARN_ON()

[Matt Roper]

On Thu, Sep 28, 2023 at 10:02:48PM -0700, Lucas De Marchi wrote:
> When xelp_pte_encode_addr() was added in commit 99a8844441ba
> ("drm/xe/migrate: Do not hand-encode pte"), there was no xe pointer for
> using xe_assert(). This is not the case anymore, so prefer it over
> XE_WARN_ON().
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_vm.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
> index beffbb1039d3..140a70d91d76 100644
> --- a/drivers/gpu/drm/xe/xe_vm.c
> +++ b/drivers/gpu/drm/xe/xe_vm.c
> @@ -17,6 +17,7 @@
>  #include <linux/mm.h>
>  #include <linux/swap.h>
>  
> +#include "xe_assert.h"
>  #include "xe_bo.h"
>  #include "xe_device.h"
>  #include "xe_drm_client.h"
> @@ -1293,7 +1294,7 @@ static u64 xelp_pte_encode_addr(struct xe_device *xe, u64 addr,
>  	u64 pte;
>  
>  	/* Avoid passing random bits directly as flags */
> -	XE_WARN_ON(flags & ~XE_PTE_PS64);
> +	xe_assert(xe, !(flags & ~XE_PTE_PS64));
>  
>  	pte = addr;
>  	pte |= XE_PAGE_PRESENT | XE_PAGE_RW;
> -- 
> 2.40.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation