From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EC319C3DA59 for ; Fri, 19 Jul 2024 23:05:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E45510E1D1; Fri, 19 Jul 2024 23:05:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e1wfbUMl"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A708B10E1D1 for ; Fri, 19 Jul 2024 23:05:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721430340; x=1752966340; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=EtfHvOISNYbYtEih05v7FgCcAhdgvJ8tQkE4qdFQzfA=; b=e1wfbUMluIg00PhmM47kUhXsNVMs3rgXKb1YM0Xy5qaWG93/OTOLETt+ Q38qieu5s7GhU+AIUo9mBtLF5TbyRWYEBWXz+2BsCcba6Nr1RrEXAzRI8 2B60CuCoIXTi6cz8VPFsPy4i2LKWugCqD8ibxida/7TzEHFpwDo5mCze3 PFUobWsf7azztirulGUjJD+tE1OL/irOs+tyR/caxjqIzw4lRBZ1duQpw JqkKKaKCGQXybZEjhJHB/oMtqxPfbDd4ZJtQhbndoRSxVI+thy268K75V oG339xNABOGGZU/NhzcTaypx7txBFktiWJknoM9n8j6WXBMeZdctvNVoi w==; X-CSE-ConnectionGUID: wV2IzNMWT7OGLHzoQ4J2PA== X-CSE-MsgGUID: 9E8BuQ1xRJyvwWahfDA1YQ== X-IronPort-AV: E=McAfee;i="6700,10204,11138"; a="29688736" X-IronPort-AV: E=Sophos;i="6.09,221,1716274800"; d="scan'208";a="29688736" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2024 16:05:39 -0700 X-CSE-ConnectionGUID: z3mGKevXTw2pHi+75gaujA== X-CSE-MsgGUID: 39ViijpiT36GkEmHRN4lAg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,221,1716274800"; d="scan'208";a="51893203" Received: from bfilipch-desk.jf.intel.com ([10.165.21.204]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jul 2024 16:05:39 -0700 From: Julia Filipchuk To: intel-xe@lists.freedesktop.org Cc: Julia Filipchuk Subject: [CI] drm/xe/guc: Enable w/a 14022293748 and 22019794406 Date: Fri, 19 Jul 2024 16:05:25 -0700 Message-ID: <20240719230525.2444543-1-julia.filipchuk@intel.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Enable workarounds for HW bug where render engine reset fails. Signed-off-by: Julia Filipchuk --- This patch is for testing KLV workarrounds. drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + drivers/gpu/drm/xe/xe_guc_ads.c | 5 +++++ drivers/gpu/drm/xe/xe_uc_fw.c | 4 ++-- drivers/gpu/drm/xe/xe_wa_oob.rules | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) 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..3190bb4ce04e 100644 --- a/drivers/gpu/drm/xe/xe_guc_ads.c +++ b/drivers/gpu/drm/xe/xe_guc_ads.c @@ -367,6 +367,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_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index c902f4a10f44..d145ce77008e 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -105,8 +105,8 @@ struct fw_blobs_by_type { }; #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \ - fw_def(BATTLEMAGE, major_ver(intel-ci/xe, guc, bmg, 70, 24, 0)) \ - fw_def(LUNARLAKE, major_ver(intel-ci/xe, guc, lnl, 70, 24, 0)) \ + fw_def(BATTLEMAGE, major_ver(intel-ci/xe, guc, bmg, 70, 29, 0)) \ + fw_def(LUNARLAKE, major_ver(intel-ci/xe, guc, lnl, 70, 29, 0)) \ fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 19, 2)) \ fw_def(PVC, mmp_ver(intel-ci/xe, guc, pvc, 70, 24, 0)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 19, 2)) \ diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index 540d38603f32..b0d7d4114967 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -27,6 +27,8 @@ 16022287689 GRAPHICS_VERSION(2001) GRAPHICS_VERSION(2004) 13011645652 GRAPHICS_VERSION(2004) +14022293748 GRAPHICS_VERSION(2004) +22019794406 GRAPHICS_VERSION(2004) 22019338487 MEDIA_VERSION(2000) GRAPHICS_VERSION(2001) 22019338487_display PLATFORM(LUNARLAKE) -- 2.45.2