From 1bd4db39dee51161c48e8669e410fff0a0f69be1 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Thu, 27 Apr 2023 13:44:46 +0200 Subject: [PATCH] drm/xe: Remove extra xe_mmio_read32 from xe_mmio_wait32 Commit 7aaec3a623ad ("drm/xe: Let's return last value read on xe_mmio_wait32.") mentions that we should return the last value read, but we never actually return it. This breaks display which depends on the value being actually returned where needed. Signed-off-by: Maarten Lankhorst Cc: Rodrigo Vivi Fixes: 7aaec3a623ad ("drm/xe: Let's return last value read on xe_mmio_wait32.") Reviewed-by: Lucas De Marchi Reviewed-by: Mika Kuoppala Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/257 Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_mmio.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.h b/drivers/gpu/drm/xe/xe_mmio.h index be7ba2813d58..b72a0a75259f 100644 --- a/drivers/gpu/drm/xe/xe_mmio.h +++ b/drivers/gpu/drm/xe/xe_mmio.h @@ -93,9 +93,6 @@ static inline int xe_mmio_wait32(struct xe_gt *gt, u32 reg, u32 val, u32 mask, u32 read; for (;;) { - if ((xe_mmio_read32(gt, reg) & mask) == val) - return 0; - read = xe_mmio_read32(gt, reg); if ((read & mask) == val) { ret = 0;