From 86011ae21c15a779dcf25b97d5670371dc14e4c3 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi <rodrigo.vivi@intel.com> Date: Thu, 12 Jan 2023 17:25:04 -0500 Subject: [PATCH] drm/xe: Stop using i915's range_overflows_t macro. Let's do it directly. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/xe/xe_guc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c index 969a2427b1f26..9234da06d205c 100644 --- a/drivers/gpu/drm/xe/xe_guc.c +++ b/drivers/gpu/drm/xe/xe_guc.c @@ -25,7 +25,7 @@ #include <linux/delay.h> /* * FIXME: This header has been deemed evil and we need to kill it. Temporarily - * including so we can use 'wait_for' and range_overflow_t. + * including so we can use 'wait_for'. */ #include "i915_utils.h" @@ -55,7 +55,8 @@ static u32 guc_bo_ggtt_addr(struct xe_guc *guc, u32 addr = xe_bo_ggtt_addr(bo); XE_BUG_ON(addr < xe_wopcm_size(guc_to_xe(guc))); - XE_BUG_ON(range_overflows_t(u32, addr, bo->size, GUC_GGTT_TOP)); + XE_BUG_ON(addr >= GUC_GGTT_TOP); + XE_BUG_ON(bo->size > GUC_GGTT_TOP - addr); return addr; } -- 2.30.2