[PATCH v4 5/8] drm/xe/guc: Bump minimum required GuC version to v70.36.0

[Umesh Nerlige Ramappa]

On Wed, Jan 29, 2025 at 03:46:48PM +0530, Riana Tauro wrote:
>The VF API version for this release is 1.17.1
>
>Bump the minimum required version to v70.36.0 to support
>engine activity.

+ John, since he mentioned offline that some platforms require a 
specific version here.

Regards,
Umesh

>
>Suggested-by: John Harrison <John.C.Harrison at Intel.com>
>Signed-off-by: Riana Tauro <riana.tauro at intel.com>
>---
> drivers/gpu/drm/xe/xe_uc_fw.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
>index 18e06ee9e23f..d9ff285c5d1d 100644
>--- a/drivers/gpu/drm/xe/xe_uc_fw.c
>+++ b/drivers/gpu/drm/xe/xe_uc_fw.c
>@@ -108,17 +108,17 @@ struct fw_blobs_by_type {
>
> #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver)			\
> 	fw_def(PANTHERLAKE,	mmp_ver(xe,	guc,	ptl,	70, 38, 1))	\
>-	fw_def(BATTLEMAGE,	major_ver(xe,	guc,	bmg,	70, 29, 2))	\
>-	fw_def(LUNARLAKE,	major_ver(xe,	guc,	lnl,	70, 29, 2))	\
>-	fw_def(METEORLAKE,	major_ver(i915,	guc,	mtl,	70, 29, 2))	\
>-	fw_def(PVC,		mmp_ver(xe,	guc,	pvc,	70, 29, 2))	\
>-	fw_def(DG2,		major_ver(i915,	guc,	dg2,	70, 29, 2))	\
>-	fw_def(DG1,		major_ver(i915,	guc,	dg1,	70, 29, 2))	\
>-	fw_def(ALDERLAKE_N,	major_ver(i915,	guc,	tgl,	70, 29, 2))	\
>-	fw_def(ALDERLAKE_P,	major_ver(i915,	guc,	adlp,	70, 29, 2))	\
>-	fw_def(ALDERLAKE_S,	major_ver(i915,	guc,	tgl,	70, 29, 2))	\
>-	fw_def(ROCKETLAKE,	major_ver(i915,	guc,	tgl,	70, 29, 2))	\
>-	fw_def(TIGERLAKE,	major_ver(i915,	guc,	tgl,	70, 29, 2))
>+	fw_def(BATTLEMAGE,	major_ver(xe,	guc,	bmg,	70, 36, 0))	\
>+	fw_def(LUNARLAKE,	major_ver(xe,	guc,	lnl,	70, 36, 0))	\
>+	fw_def(METEORLAKE,	major_ver(i915,	guc,	mtl,	70, 36, 0))	\
>+	fw_def(PVC,		mmp_ver(xe,	guc,	pvc,	70, 36, 0))	\
>+	fw_def(DG2,		major_ver(i915,	guc,	dg2,	70, 36, 0))	\
>+	fw_def(DG1,		major_ver(i915,	guc,	dg1,	70, 36, 0))	\
>+	fw_def(ALDERLAKE_N,	major_ver(i915,	guc,	tgl,	70, 36, 0))	\
>+	fw_def(ALDERLAKE_P,	major_ver(i915,	guc,	adlp,	70, 36, 0))	\
>+	fw_def(ALDERLAKE_S,	major_ver(i915,	guc,	tgl,	70, 36, 0))	\
>+	fw_def(ROCKETLAKE,	major_ver(i915,	guc,	tgl,	70, 36, 0))	\
>+	fw_def(TIGERLAKE,	major_ver(i915,	guc,	tgl,	70, 36, 0))
>
> #define XE_HUC_FIRMWARE_DEFS(fw_def, mmp_ver, no_ver)		\
> 	fw_def(PANTHERLAKE,	mmp_ver(xe,	huc,		ptl, 10, 2, 1))	\
>@@ -320,9 +320,9 @@ static int guc_read_css_info(struct xe_uc_fw *uc_fw, struct uc_css_header *css)
>
> 	xe_gt_assert(gt, uc_fw->type == XE_UC_FW_TYPE_GUC);
>
>-	/* We don't support GuC releases older than 70.29.2 */
>-	if (MAKE_GUC_VER_STRUCT(*release) < MAKE_GUC_VER(70, 29, 2)) {
>-		xe_gt_err(gt, "Unsupported GuC v%u.%u.%u! v70.29.2 or newer is required\n",
>+	/* We don't support GuC releases older than 70.36.0 */
>+	if (MAKE_GUC_VER_STRUCT(*release) < MAKE_GUC_VER(70, 36, 0)) {
>+		xe_gt_err(gt, "Unsupported GuC v%u.%u.%u! v70.36.0 or newer is required\n",
> 			  release->major, release->minor, release->patch);
> 		return -EINVAL;
> 	}
>-- 
>2.47.1
>