drm/xe: Stop using i915's range_overflows_t macro.
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 12 Jan 2023 22:25:04 +0000 (17:25 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 12 Dec 2023 19:05:59 +0000 (14:05 -0500)
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

index 969a2427b1f260b7372b5a829db6074c55fb082b..9234da06d205cb9ed640e8dcaaba8b9ba242d4f1 100644 (file)
@@ -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;
 }