[PATCH v2 1/4] drm/xe/uc: Prepare uc_fw_version for storing the VF ABI version
Michal Wajdeczko
michal.wajdeczko at intel.com
Thu May 29 20:35:10 UTC 2025
On 29.05.2025 01:42, Daniele Ceraolo Spurio wrote:
> 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 at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> ---
> drivers/gpu/drm/xe/xe_guc_engine_activity.c | 2 +-
> drivers/gpu/drm/xe/xe_uc_fw_types.h | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_guc_engine_activity.c b/drivers/gpu/drm/xe/xe_guc_engine_activity.c
> index 0fb48f8f05d8..92e1f9f41b8c 100644
> --- 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 ad3b35a0e6eb..914026015019 100644
> --- 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 */
More information about the Intel-xe
mailing list