[PATCH v5] drm/xe/guc: Enable w/a 14022293748 and 22019794406

[Lucas De Marchi]

On Mon, Aug 05, 2024 at 01:54:35PM GMT, Daniele Ceraolo Spurio wrote:
>From: Julia Filipchuk <julia.filipchuk at intel.com>
>
>Enable workarounds for HW bug where render engine reset fails. Given
>that we're bumping the minimun required GuC version to 70.29, we're
>guaranteed to always have support for this KLV in the GuC.
>
>v2: Enable KLV correctly for either workaround (Lucas)
>v4: Add check for minimum supported GuC firmware version. Enable w/a for
>hw version 20.01 too. (Daniele)
>v5 (Daniele): remove now unneeded fw type and version checks (JohnH)
>
>Signed-off-by: Julia Filipchuk <julia.filipchuk at intel.com>
>Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
>Cc: John Harrison <John.C.Harrison at Intel.com>


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

Lucas De Marchi

>---
> drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 +
> drivers/gpu/drm/xe/xe_guc_ads.c       | 6 ++++++
> drivers/gpu/drm/xe/xe_wa_oob.rules    | 4 ++++
> 3 files changed, 11 insertions(+)
>
>diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
>index 8f9f60b28306..6b30743a2f6c 100644
>--- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
>+++ b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
>@@ -351,6 +351,7 @@ enum xe_guc_klv_ids {
> 	GUC_WORKAROUND_KLV_ID_GAM_PFQ_SHADOW_TAIL_POLLING				= 0x9005,
> 	GUC_WORKAROUND_KLV_ID_DISABLE_MTP_DURING_ASYNC_COMPUTE				= 0x9007,
> 	GUC_WA_KLV_NP_RD_WRITE_TO_CLEAR_RCSM_AT_CGP_LATE_RESTORE			= 0x9008,
>+	GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET				= 0x9009,
> };
>
> #endif
>diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
>index 1c60b685dbc6..d1902a8581ca 100644
>--- a/drivers/gpu/drm/xe/xe_guc_ads.c
>+++ b/drivers/gpu/drm/xe/xe_guc_ads.c
>@@ -24,6 +24,7 @@
> #include "xe_map.h"
> #include "xe_mmio.h"
> #include "xe_platform_types.h"
>+#include "xe_uc_fw.h"
> #include "xe_wa.h"
>
> /* Slack of a few additional entries per engine */
>@@ -367,6 +368,11 @@ static void guc_waklv_init(struct xe_guc_ads *ads)
> 					  0xC40,
> 					  &offset, &remain);
>
>+	if (XE_WA(gt, 14022293748) || XE_WA(gt, 22019794406))
>+		guc_waklv_enable_simple(ads,
>+					GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET,
>+					&offset, &remain);
>+
> 	size = guc_ads_waklv_size(ads) - remain;
> 	if (!size)
> 		return;
>diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
>index 540d38603f32..5cf27ff27ce6 100644
>--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
>+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
>@@ -27,6 +27,10 @@
> 16022287689	GRAPHICS_VERSION(2001)
> 		GRAPHICS_VERSION(2004)
> 13011645652	GRAPHICS_VERSION(2004)
>+14022293748	GRAPHICS_VERSION(2001)
>+		GRAPHICS_VERSION(2004)
>+22019794406	GRAPHICS_VERSION(2001)
>+		GRAPHICS_VERSION(2004)
> 22019338487	MEDIA_VERSION(2000)
> 		GRAPHICS_VERSION(2001)
> 22019338487_display	PLATFORM(LUNARLAKE)
>-- 
>2.43.0
>