Commit 28523083 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi
Browse files

drm/xe/vm: Prefer xe_assert() over XE_WARN_ON() 



When xelp_pte_encode_addr() was added in commit 23c8495e
("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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent f8ebadd0

drivers/gpu/drm/xe/xe_vm.c

+2 −1
Original line number Diff line number Diff line
@@ -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"
@@ -1312,7 +1313,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;