+ Leo,
On Thu, Mar 24, 2022 at 10:59:14AM +0800, Zhang, Yifan wrote:
> From: Boyuan Zhang <boyuan.zhang@xxxxxxx>
>
> For VCN FW to detect ASIC type
>
> Signed-off-by: Boyuan Zhang <boyuan.zhang@xxxxxxx>
> Signed-off-by: Yifan Zhang <yifan1.zhang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 7 +++++++
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 7 +++++++
> 2 files changed, 14 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index e2fde88aaf5e..f06fb7f882e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -159,6 +159,7 @@
> #define AMDGPU_VCN_MULTI_QUEUE_FLAG (1 << 8)
> #define AMDGPU_VCN_SW_RING_FLAG (1 << 9)
> #define AMDGPU_VCN_FW_LOGGING_FLAG (1 << 10)
> +#define AMDGPU_VCN_SMU_VERSION_INFO_FLAG (1 << 11)
>
> #define AMDGPU_VCN_IB_FLAG_DECODE_BUFFER 0x00000001
> #define AMDGPU_VCN_CMD_FLAG_MSG_BUFFER 0x00000001
> @@ -279,6 +280,11 @@ struct amdgpu_fw_shared_fw_logging {
> uint32_t size;
> };
>
> +struct amdgpu_fw_shared_smu_interface_info {
> + uint8_t smu_interface_type;
> + uint8_t padding[3];
> +};
> +
> struct amdgpu_fw_shared {
> uint32_t present_flag_0;
> uint8_t pad[44];
> @@ -287,6 +293,7 @@ struct amdgpu_fw_shared {
> struct amdgpu_fw_shared_multi_queue multi_queue;
> struct amdgpu_fw_shared_sw_ring sw_ring;
> struct amdgpu_fw_shared_fw_logging fw_log;
> + struct amdgpu_fw_shared_smu_interface_info smu_interface_info;
> };
>
> struct amdgpu_vcn_fwlog {
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index b16c56aa2d22..c5bf7cbfa82c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -219,6 +219,13 @@ static int vcn_v3_0_sw_init(void *handle)
> cpu_to_le32(AMDGPU_VCN_MULTI_QUEUE_FLAG) |
> cpu_to_le32(AMDGPU_VCN_FW_SHARED_FLAG_0_RB);
> fw_shared->sw_ring.is_enabled = cpu_to_le32(DEC_SW_RING_ENABLED);
> + if (adev->ip_versions[UVD_HWIP][0] == IP_VERSION(3, 1, 2)) {
> + fw_shared->present_flag_0 |= AMDGPU_VCN_SMU_VERSION_INFO_FLAG;
> + fw_shared->smu_interface_info.smu_interface_type = 2;
> + } else if(adev->ip_versions[UVD_HWIP][0] == IP_VERSION(3, 1, 1)) {
> + fw_shared->present_flag_0 |= AMDGPU_VCN_SMU_VERSION_INFO_FLAG;
> + fw_shared->smu_interface_info.smu_interface_type = 1;
> + }
fw_shared->present_flag_0 |= AMDGPU_VCN_SMU_VERSION_INFO_FLAG;
This line can be moved out of "if else".
With that fixed, patch is Acked-by: Huang Rui <ray.huang@xxxxxxx>
>
> if (amdgpu_vcnfw_log)
> amdgpu_vcn_fwlog_init(&adev->vcn.inst[i]);
> --
> 2.35.1
>
