Re: [PATCH v3 13/23] drm/xe: Make display part of Wa_22019338487 a device workaround

[Gustavo Sousa <gustavo.sousa@intel.com>]

Quoting Matt Roper (2025-09-30 19:56:30-03:00)
>The display part of Wa_22019338487 (i.e., avoiding use of stolen memory)
>is using a platform test rather than an graphics/media IP test.  Since
>this workaround is focused on non-GT uses of stolen memory, it makes
>sense that we'd want to still apply the workaround on affected platforms
>even if the GTs themselves are disabled via configfs.
>
>Signed-off-by: Matt Roper <matthew.d.roper@intel.com>

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>

>---
> drivers/gpu/drm/xe/display/intel_fbdev_fb.c   | 4 ++--
> drivers/gpu/drm/xe/display/xe_plane_initial.c | 4 ++--
> drivers/gpu/drm/xe/xe_device_wa_oob.rules     | 1 +
> drivers/gpu/drm/xe/xe_wa_oob.rules            | 1 -
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
>index 35a5b07eeba4..af72f7305e5a 100644
>--- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
>+++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
>@@ -10,7 +10,7 @@
> #include "xe_ttm_stolen_mgr.h"
> #include "xe_wa.h"
> 
>-#include <generated/xe_wa_oob.h>
>+#include <generated/xe_device_wa_oob.h>
> 
> struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size)
> {
>@@ -19,7 +19,7 @@ struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size
> 
>         obj = ERR_PTR(-ENODEV);
> 
>-        if (!IS_DGFX(xe) && !XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display)) {
>+        if (!IS_DGFX(xe) && !XE_DEVICE_WA(xe, 22019338487_display)) {
>                 obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe),
>                                                 size,
>                                                 ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
>diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
>index 94f00def811b..12d25c5290fd 100644
>--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
>+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
>@@ -25,7 +25,7 @@
> #include "xe_vram_types.h"
> #include "xe_wa.h"
> 
>-#include <generated/xe_wa_oob.h>
>+#include <generated/xe_device_wa_oob.h>
> 
> void intel_plane_initial_vblank_wait(struct intel_crtc *crtc)
> {
>@@ -123,7 +123,7 @@ initial_plane_bo(struct xe_device *xe,
>                 phys_base = base;
>                 flags |= XE_BO_FLAG_STOLEN;
> 
>-                if (XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display))
>+                if (XE_DEVICE_WA(xe, 22019338487_display))
>                         return NULL;
> 
>                 /*
>diff --git a/drivers/gpu/drm/xe/xe_device_wa_oob.rules b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>index 3a0c4ccc4224..3cc93f0e77f8 100644
>--- a/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>+++ b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
>@@ -1,2 +1,3 @@
> 15015404425     PLATFORM(LUNARLAKE)
>                 PLATFORM(PANTHERLAKE)
>+22019338487_display        PLATFORM(LUNARLAKE)
>diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
>index f3a6d5d239ce..eb761d30e066 100644
>--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
>+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
>@@ -45,7 +45,6 @@
> 22019338487        MEDIA_VERSION(2000)
>                 GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)
>                 MEDIA_VERSION(3000), MEDIA_STEP(A0, B0), FUNC(xe_rtp_match_not_sriov_vf)
>-22019338487_display        PLATFORM(LUNARLAKE)
> 16023588340        GRAPHICS_VERSION(2001), FUNC(xe_rtp_match_not_sriov_vf)
> 14019789679        GRAPHICS_VERSION(1255)
>                 GRAPHICS_VERSION_RANGE(1270, 2004)
>-- 
>2.51.0
>