drm/xe/oa: MERTOA Wa_14026746987

Wa_14026746987 implies that only XE_OAM_FORMAT_MPEC8u32_B8_C8 and not
XE_OAM_FORMAT_MPEC8u64_B8_C8 can be supported for MERTOA unit.

Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patch.msgid.link/20260430161459.2892545-3-ashutosh.dixit@intel.com

diff --git a/drivers/gpu/drm/xe/xe_device_wa_oob.rules b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
index 92371c4905290001a86b5e6e4ce954dda395840a..0793b9e63549593d088d78fd9c0349ee0d9297d6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_device_wa_oob.rules
+++ b/drivers/gpu/drm/xe/xe_device_wa_oob.rules
@@ -5,3 +5,4 @@
 14022085890    SUBPLATFORM(BATTLEMAGE, G21)
 14026539277    PLATFORM(NOVALAKE_P), PLATFORM_STEP(A0, B0)
 14026633728    PLATFORM(CRESCENTISLAND)
+14026746987    PLATFORM(CRESCENTISLAND)

diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c
index b767dccfc4fc7313ebf86adebdc68c5d4713879c..13458050907adb91e2751f33a1088f07682a46c8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_oa.c
+++ b/drivers/gpu/drm/xe/xe_oa.c
@@ -1942,9 +1942,12 @@ static bool oa_unit_supports_oa_format(struct xe_oa *oa, struct xe_oa_open_param
        case DRM_XE_OA_UNIT_TYPE_OAG:
                return f->type == DRM_XE_OA_FMT_TYPE_OAG || f->type == DRM_XE_OA_FMT_TYPE_OAR ||
                        f->type == DRM_XE_OA_FMT_TYPE_OAC || f->type == DRM_XE_OA_FMT_TYPE_PEC;
+       case DRM_XE_OA_UNIT_TYPE_MERT:
+               if (XE_DEVICE_WA(oa->xe, 14026746987))
+                       return param->oa_format == XE_OAM_FORMAT_MPEC8u32_B8_C8;
+               fallthrough;
        case DRM_XE_OA_UNIT_TYPE_OAM:
        case DRM_XE_OA_UNIT_TYPE_OAM_SAG:
-       case DRM_XE_OA_UNIT_TYPE_MERT:
                return f->type == DRM_XE_OA_FMT_TYPE_OAM || f->type == DRM_XE_OA_FMT_TYPE_OAM_MPEC;
        default:
                return false;