From eeb8019d8c6fba1eae6ef8a238b42ff9b39dbaa4 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Thu, 12 Jan 2023 17:25:10 -0500 Subject: [PATCH] drm/xe: Let's avoid i915_utils in the xe_force_wake. We can run the bit operation locally without yet another macro. Signed-off-by: Rodrigo Vivi Reviewed-by: Matthew Brost --- drivers/gpu/drm/xe/xe_force_wake.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c index a203eabba4e29..b87bf3b4cd52d 100644 --- a/drivers/gpu/drm/xe/xe_force_wake.c +++ b/drivers/gpu/drm/xe/xe_force_wake.c @@ -10,11 +10,6 @@ #include "xe_mmio.h" #include "gt/intel_gt_regs.h" -/* - * FIXME: This header has been deemed evil and we need to kill it. Temporarily - * including so we can use '__mask_next_bit'. - */ -#include "i915_utils.h" #define XE_FORCE_WAKE_ACK_TIMEOUT_MS 50 @@ -145,9 +140,9 @@ static int domain_sleep_wait(struct xe_gt *gt, } #define for_each_fw_domain_masked(domain__, mask__, fw__, tmp__) \ - for (tmp__ = (mask__); tmp__ ;) \ + for (tmp__ = (mask__); tmp__; tmp__ &= ~BIT(ffs(tmp__) - 1)) \ for_each_if((domain__ = ((fw__)->domains + \ - __mask_next_bit(tmp__))) && \ + (ffs(tmp__) - 1))) && \ domain__->reg_ctl) int xe_force_wake_get(struct xe_force_wake *fw, -- 2.30.2