[Intel-xe] [PATCH] fixup! drm/xe/guc: Report submission version of GuC firmware

[Matthew Brost]

On Tue, Aug 29, 2023 at 04:30:53PM -0700, Daniele Ceraolo Spurio wrote:
> Major GuC versions greater than 70 will have the submission version in
> the herader irrespective of their minor version number.
> 
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Cc: Matthew Brost <matthew.brost at intel.com>

Reviewed-by: Matthew Brost <matthew.brost at intel.com>

> Cc: John Harrison <John.C.Harrison at Intel.com>
> ---
>  drivers/gpu/drm/xe/xe_uc_fw.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index e2f42f1bc89a..37ad238148b0 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -252,7 +252,7 @@ static void guc_read_css_info(struct xe_uc_fw *uc_fw, struct uc_css_header *css)
>  	XE_WARN_ON(uc_fw->type != XE_UC_FW_TYPE_GUC);
>  	XE_WARN_ON(uc_fw->major_ver_found < 70);
>  
> -	if (uc_fw->minor_ver_found >= 6) {
> +	if (uc_fw->major_ver_found > 70 || uc_fw->minor_ver_found >= 6) {
>  		/* v70.6.0 adds CSS header support */
>  		guc->submission_state.version.major =
>  			FIELD_GET(CSS_SW_VERSION_UC_MAJOR,
> -- 
> 2.41.0
>