[PATCH 1/2] drm/amdgpu: fix VCN2.x number of irq types

[James Zhu]

Reviewed-by: James Zhu <James.Zhu at amd.com> for the series

On 2019-12-09 4:10 p.m., Leo Liu wrote:
> The JPEG irq type has been moved to its own structure
>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index 5649190cb629..d76ece38c97b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -1788,7 +1788,7 @@ static const struct amdgpu_irq_src_funcs vcn_v2_0_irq_funcs = {
>   
>   static void vcn_v2_0_set_irq_funcs(struct amdgpu_device *adev)
>   {
> -	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 2;
> +	adev->vcn.inst->irq.num_types = adev->vcn.num_enc_rings + 1;
>   	adev->vcn.inst->irq.funcs = &vcn_v2_0_irq_funcs;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index 42d6b9f0553b..f67fca38c1a9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -1138,7 +1138,7 @@ static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev)
>   	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>   		if (adev->vcn.harvest_config & (1 << i))
>   			continue;
> -		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 2;
> +		adev->vcn.inst[i].irq.num_types = adev->vcn.num_enc_rings + 1;
>   		adev->vcn.inst[i].irq.funcs = &vcn_v2_5_irq_funcs;
>   	}
>   }