From b56d208273bf5be6593d0dcd2d471f771c08a805 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Thu, 12 Jan 2023 17:25:09 -0500 Subject: [PATCH] drm/xe: Stop using i915_utils in xe_wopcm. We don't need any macro for a simple check we can do explicitly and clear. Signed-off-by: Rodrigo Vivi Reviewed-by: Matthew Brost --- drivers/gpu/drm/xe/xe_wopcm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_wopcm.c b/drivers/gpu/drm/xe/xe_wopcm.c index e4a8d4a1899e8..8fe182afa06c5 100644 --- a/drivers/gpu/drm/xe/xe_wopcm.c +++ b/drivers/gpu/drm/xe/xe_wopcm.c @@ -11,8 +11,6 @@ #include "xe_uc_fw.h" #include "xe_wopcm.h" -#include "i915_utils.h" - /** * DOC: Write Once Protected Content Memory (WOPCM) Layout * @@ -92,7 +90,8 @@ static bool __check_layout(struct xe_device *xe, u32 wopcm_size, u32 size; size = wopcm_size - ctx_rsvd; - if (unlikely(range_overflows(guc_wopcm_base, guc_wopcm_size, size))) { + if (unlikely(guc_wopcm_base >= size || + guc_wopcm_size > size - guc_wopcm_base)) { drm_err(&xe->drm, "WOPCM: invalid GuC region layout: %uK + %uK > %uK\n", guc_wopcm_base / SZ_1K, guc_wopcm_size / SZ_1K, -- 2.30.2