[PATCH v5 4/6] drm/xe: Move Wa_15015404425 to use the new XE_DEVICE_WA macro

[Lucas De Marchi]

On Wed, Jul 02, 2025 at 12:30:34PM -0700, Matt Atwood wrote:
>Move Wa_15015404425 to use the new implemented OOB macro XE_DEVICE_WA()
>
>v2: rename from SoC to Device
>v5: move workaround call back into the flush call
>
>Signed-off-by: Matt Atwood <matthew.s.atwood at intel.com>
>---
> drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 +
> drivers/gpu/drm/xe/xe_mmio.c              | 5 ++++-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_device_wa_oob.rules b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>index e69de29bb2d1..b7d12ea4d65c 100644
>--- a/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>+++ b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>@@ -0,0 +1 @@
>+15015404425     PLATFORM(LUNARLAKE)
>diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
>index 7357458bc0d2..f92fd8e97079 100644
>--- a/drivers/gpu/drm/xe/xe_mmio.c
>+++ b/drivers/gpu/drm/xe/xe_mmio.c
>@@ -22,6 +22,9 @@
> #include "xe_macros.h"
> #include "xe_sriov.h"
> #include "xe_trace.h"
>+#include "xe_wa.h"
>+
>+#include "generated/xe_device_wa_oob.h"
>
> static void tiles_fini(void *arg)
> {
>@@ -163,7 +166,7 @@ static void mmio_flush_pending_writes(struct xe_mmio *mmio)
> #define DUMMY_REG_OFFSET	0x130030
> 	int i;
>
>-	if (mmio->tile->xe->info.platform != XE_LUNARLAKE)
>+	if (!XE_DEVICE_WA(mmio->tile->xe, 15015404425))
> 		return;

since now we have the info in the code of wth we are doing this, all the
comments /* Wa_15015404425 */ can be removed.


With that, Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

thanks
Lucas De Marchi

>
> 	/* 4 dummy writes */
>-- 
>2.49.0
>