drm/xe/uc: Prepare uc_fw_version for storing the VF ABI version

The VF ABI version has a branch field, so to store it inside the
uc_fw_version we need to add a new branch variable to the latter.
Existing code needs to be updated to handle the fact that we have the
new field.

v2: split out to its own patch (Michal)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://lore.kernel.org/r/20250603235432.720833-7-daniele.ceraolospurio@intel.com

diff --git a/drivers/gpu/drm/xe/xe_guc_engine_activity.c b/drivers/gpu/drm/xe/xe_guc_engine_activity.c
index 0fb48f8f05d8478bd5c5205c3221c8c7488efd51..92e1f9f41b8c57c34a88e282b6cfb5aa2ebc83cf 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_engine_activity.c
+++ b/drivers/gpu/drm/xe/xe_guc_engine_activity.c
@@ -124,7 +124,7 @@ static void free_engine_activity_buffers(struct engine_activity_buffer *buffer)
 static bool is_engine_activity_supported(struct xe_guc *guc)
 {
        struct xe_uc_fw_version *version = &guc->fw.versions.found[XE_UC_FW_VER_COMPATIBILITY];
-       struct xe_uc_fw_version required = { 1, 14, 1 };
+       struct xe_uc_fw_version required = { .major = 1, .minor = 14, .patch = 1 };
        struct xe_gt *gt = guc_to_gt(guc);
 
        if (IS_SRIOV_VF(gt_to_xe(gt))) {

diff --git a/drivers/gpu/drm/xe/xe_uc_fw_types.h b/drivers/gpu/drm/xe/xe_uc_fw_types.h
index ad3b35a0e6ebcb442836b3329c808dd1c66c72f0..9140260150195c30ea55e422bd0486fed208b763 100644 (file)
--- a/drivers/gpu/drm/xe/xe_uc_fw_types.h
+++ b/drivers/gpu/drm/xe/xe_uc_fw_types.h
@@ -65,6 +65,8 @@ enum xe_uc_fw_type {
  * struct xe_uc_fw_version - Version for XE micro controller firmware
  */
 struct xe_uc_fw_version {
+       /** @branch: branch version of the FW (not always available) */
+       u16 branch;
        /** @major: major version of the FW */
        u16 major;
        /** @minor: minor version of the FW */