Applied the series.
Thanks!
Alex
On Sun, Aug 24, 2025 at 8:48 PM Rodrigo Siqueira <sique...@igalia.com> wrote:
>
> The function amdgpu_vcn_sw_fini() returns an integer, but this number is
> always 0. This commit changes the amdgpu_vcn_sw_fini() return to void,
> and eliminates all checks to this return across different VCNs.
>
> Signed-off-by: Rodrigo Siqueira <sique...@igalia.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 6 ++----
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +-
> drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 7 ++-----
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 7 ++-----
> drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 7 ++-----
> drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 9 +++------
> 11 files changed, 19 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 9a76e11d1c18..4ceb67febaae 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -257,12 +257,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int
> i)
> return 0;
> }
>
> -int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
> +void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
> {
> int j;
>
> if (adev->vcn.harvest_config & (1 << i))
> - return 0;
> + return;
>
> amdgpu_bo_free_kernel(
> &adev->vcn.inst[i].dpg_sram_bo,
> @@ -292,8 +292,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i)
>
> mutex_destroy(&adev->vcn.inst[i].vcn_pg_lock);
> mutex_destroy(&adev->vcn.inst[i].vcn1_jpeg1_workaround);
> -
> - return 0;
> }
>
> bool amdgpu_vcn_is_disabled_vcn(struct amdgpu_device *adev, enum
> vcn_ring_type type, uint32_t vcn_instance)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index b3fb1d0e43fc..e2911eb915ab 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -516,7 +516,7 @@ enum vcn_ring_type {
>
> int amdgpu_vcn_early_init(struct amdgpu_device *adev, int i);
> int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int i);
> -int amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i);
> +void amdgpu_vcn_sw_fini(struct amdgpu_device *adev, int i);
> int amdgpu_vcn_suspend(struct amdgpu_device *adev, int i);
> int amdgpu_vcn_resume(struct amdgpu_device *adev, int i);
> void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index c74947705d77..66dc3b5d01eb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -230,11 +230,11 @@ static int vcn_v1_0_sw_fini(struct amdgpu_ip_block
> *ip_block)
>
> jpeg_v1_0_sw_fini(ip_block);
>
> - r = amdgpu_vcn_sw_fini(adev, 0);
> + amdgpu_vcn_sw_fini(adev, 0);
>
> kfree(adev->vcn.ip_dump);
>
> - return r;
> + return 0;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> index b115137ab2d6..c4e2659f8933 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
> @@ -267,9 +267,9 @@ static int vcn_v2_0_sw_fini(struct amdgpu_ip_block
> *ip_block)
>
> amdgpu_vcn_sysfs_reset_mask_fini(adev);
>
> - r = amdgpu_vcn_sw_fini(adev, 0);
> + amdgpu_vcn_sw_fini(adev, 0);
>
> - return r;
> + return 0;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> index 3a7c137a83ef..748351e2da7e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
> @@ -465,9 +465,7 @@ static int vcn_v2_5_sw_fini(struct amdgpu_ip_block
> *ip_block)
> r = amdgpu_vcn_suspend(adev, i);
> if (r)
> return r;
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> + amdgpu_vcn_sw_fini(adev, i);
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index 95173156f956..a615d6a0a698 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -349,9 +349,7 @@ static int vcn_v3_0_sw_fini(struct amdgpu_ip_block
> *ip_block)
> if (r)
> return r;
>
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> + amdgpu_vcn_sw_fini(adev, i);
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 1785786a72f8..7e425cda388f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -302,11 +302,8 @@ static int vcn_v4_0_sw_fini(struct amdgpu_ip_block
> *ip_block)
>
> amdgpu_vcn_sysfs_reset_mask_fini(adev);
>
> - for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> - }
> + for (i = 0; i < adev->vcn.num_vcn_inst; i++)
> + amdgpu_vcn_sw_fini(adev, i);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> index bae1ad4484ed..5fbd755fc24c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
> @@ -283,11 +283,8 @@ static int vcn_v4_0_3_sw_fini(struct amdgpu_ip_block
> *ip_block)
>
> amdgpu_vcn_sysfs_reset_mask_fini(adev);
>
> - for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> - }
> + for (i = 0; i < adev->vcn.num_vcn_inst; i++)
> + amdgpu_vcn_sw_fini(adev, i);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> index 75c884a8f556..514c4e7e806e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> @@ -270,9 +270,7 @@ static int vcn_v4_0_5_sw_fini(struct amdgpu_ip_block
> *ip_block)
> if (r)
> return r;
>
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> + amdgpu_vcn_sw_fini(adev, i);
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> index 455f829b8bb9..92da911a5e4c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -232,11 +232,8 @@ static int vcn_v5_0_0_sw_fini(struct amdgpu_ip_block
> *ip_block)
>
> amdgpu_vcn_sysfs_reset_mask_fini(adev);
>
> - for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> - }
> + for (i = 0; i < adev->vcn.num_vcn_inst; i++)
> + amdgpu_vcn_sw_fini(adev, i);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
> b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
> index 7cb21e2b4eb0..b8097718882c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
> @@ -245,14 +245,11 @@ static int vcn_v5_0_1_sw_fini(struct amdgpu_ip_block
> *ip_block)
> return r;
> }
>
> - for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
> - r = amdgpu_vcn_sw_fini(adev, i);
> - if (r)
> - return r;
> - }
> -
> amdgpu_vcn_sysfs_reset_mask_fini(adev);
>
> + for (i = 0; i < adev->vcn.num_vcn_inst; i++)
> + amdgpu_vcn_sw_fini(adev, i);
> +
> return 0;
> }
>
> --
> 2.47.2
>
