[PATCH] drm/amdgpu: add VCN to firmware query interface

[Huang Rui]

On Fri, Mar 16, 2018 at 11:07:08AM -0500, Alex Deucher wrote:
> Need to be able to query the VCN firmware version from
> userspace to determine supported features, etc.
> 

Reviewed-by: Huang Rui <ray.huang at amd.com>

> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 ++++++++++++
>  include/uapi/drm/amdgpu_drm.h           |  2 ++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 04a2219ce25e..9290a7b81950 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -213,6 +213,10 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
>  		fw_info->ver = adev->uvd.fw_version;
>  		fw_info->feature = 0;
>  		break;
> +	case AMDGPU_INFO_FW_VCN:
> +		fw_info->ver = adev->vcn.fw_version;
> +		fw_info->feature = 0;
> +		break;
>  	case AMDGPU_INFO_FW_GMC:
>  		fw_info->ver = adev->gmc.fw_version;
>  		fw_info->feature = 0;
> @@ -1314,6 +1318,14 @@ static int amdgpu_debugfs_firmware_info(struct seq_file *m, void *data)
>  			   i, fw_info.feature, fw_info.ver);
>  	}
>  
> +	/* VCN */
> +	query_fw.fw_type = AMDGPU_INFO_FW_VCN;
> +	ret = amdgpu_firmware_info(&fw_info, &query_fw, adev);
> +	if (ret)
> +		return ret;
> +	seq_printf(m, "VCN feature version: %u, firmware version: 0x%08x\n",
> +		   fw_info.feature, fw_info.ver);
> +
>  	return 0;
>  }
>  
> diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
> index a967e8de5973..68d93b482f42 100644
> --- a/include/uapi/drm/amdgpu_drm.h
> +++ b/include/uapi/drm/amdgpu_drm.h
> @@ -687,6 +687,8 @@ struct drm_amdgpu_cs_chunk_data {
>  	#define AMDGPU_INFO_FW_SOS		0x0c
>  	/* Subquery id: Query PSP ASD firmware version */
>  	#define AMDGPU_INFO_FW_ASD		0x0d
> +	/* Subquery id: Query VCN firmware version */
> +	#define AMDGPU_INFO_FW_VCN		0x0e
>  /* number of bytes moved for TTM migration */
>  #define AMDGPU_INFO_NUM_BYTES_MOVED		0x0f
>  /* the used VRAM size */
> -- 
> 2.13.6
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx