summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/xe/xe_device.c
diff options
context:
space:
mode:
authorFrancois Dugast <francois.dugast@intel.com>2023-09-12 11:36:35 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-21 19:41:08 +0300
commitc73acc1eeba5e380a367087cb7b933b946613ee7 (patch)
tree7f4df12ec4221d5ffefc92fbbbb813d5874f7c96 /drivers/gpu/drm/xe/xe_device.c
parent1975b5917a94429096f6a2cccc97ed91e0425708 (diff)
downloadlinux-c73acc1eeba5e380a367087cb7b933b946613ee7.tar.xz
drm/xe: Use Xe assert macros instead of XE_WARN_ON macro
The XE_WARN_ON macro maps to WARN_ON which is not justified in many cases where only a simple debug check is needed. Replace the use of the XE_WARN_ON macro with the new xe_assert macros which relies on drm_*. This takes a struct drm_device argument, which is one of the main changes in this commit. The other main change is that the condition is reversed, as with XE_WARN_ON a message is displayed if the condition is true, whereas with xe_assert it is if the condition is false. v2: - Rebase - Keep WARN splats in xe_wopcm.c (Matt Roper) v3: - Rebase Signed-off-by: Francois Dugast <francois.dugast@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_device.c')
-rw-r--r--drivers/gpu/drm/xe/xe_device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index df1953759c67..986a02a66166 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -394,7 +394,7 @@ bool xe_device_mem_access_get_if_ongoing(struct xe_device *xe)
if (active) {
int ref = atomic_inc_return(&xe->mem_access.ref);
- XE_WARN_ON(ref == S32_MAX);
+ xe_assert(xe, ref != S32_MAX);
}
return active;
@@ -436,7 +436,7 @@ void xe_device_mem_access_get(struct xe_device *xe)
xe_pm_runtime_get(xe);
ref = atomic_inc_return(&xe->mem_access.ref);
- XE_WARN_ON(ref == S32_MAX);
+ xe_assert(xe, ref != S32_MAX);
}
@@ -450,5 +450,5 @@ void xe_device_mem_access_put(struct xe_device *xe)
ref = atomic_dec_return(&xe->mem_access.ref);
xe_pm_runtime_put(xe);
- XE_WARN_ON(ref < 0);
+ xe_assert(xe, ref >= 0);
}