diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-01-12 17:25:11 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-12 14:05:59 -0500 |
| commit | 81593af6c88d3482997e43f0a85ccd93cc4928df (patch) | |
| tree | 8c53460d398353e874d0da7c04dbda1d64a65b2f /drivers/gpu/drm/xe/xe_gt_mcr.c | |
| parent | eeb8019d8c6fba1eae6ef8a238b42ff9b39dbaa4 (diff) | |
drm/xe: Convert xe_mmio_wait32 to us so we can stop using wait_for_us.
Another clean-up towards killing the usage of i915_utils.h
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_gt_mcr.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt_mcr.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c index 8add5ec9a307..f4bfff98d5f4 100644 --- a/drivers/gpu/drm/xe/xe_gt_mcr.c +++ b/drivers/gpu/drm/xe/xe_gt_mcr.c @@ -11,13 +11,6 @@ #include "gt/intel_gt_regs.h" -#include <linux/delay.h> -/* - * FIXME: This header has been deemed evil and we need to kill it. Temporar - * including so we can use 'wait_for'. - */ -#include "i915_utils.h" - /** * DOC: GT Multicast/Replicated (MCR) Register Support * @@ -383,7 +376,7 @@ static void mcr_lock(struct xe_gt *gt) * shares the same steering control register. */ if (GRAPHICS_VERx100(xe) >= 1270) - ret = wait_for_us(xe_mmio_read32(gt, STEER_SEMAPHORE) == 0x1, 10); + ret = xe_mmio_wait32(gt, STEER_SEMAPHORE, 0, 0x1, 10, NULL); drm_WARN_ON_ONCE(&xe->drm, ret == -ETIMEDOUT); } |