[PATCH] drm/amdgpu/vcn: fix unitialized variable warnings

Christian König ckoenig.leichtzumerken at gmail.com
Fri Apr 19 11:50:40 UTC 2024


Am 18.04.24 um 20:07 schrieb Pierre-Eric Pelloux-Prayer:
> Init r to 0 to avoid returning an uninitialized value if we never
> enter the loop. This case should never be hit in practive, but
> returning 0 doesn't hurt.
>
> The same fix is applied to the 4 places using the same pattern.
>
> Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c   | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c   | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> index 8f82fb887e9c..724445545563 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
> @@ -298,7 +298,7 @@ static int vcn_v3_0_hw_init(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	struct amdgpu_ring *ring;
> -	int i, j, r;
> +	int i, j, r = 0;

That is usually considered bad coding style.

Better insert a "return 0;" directly before the done label.

Regards,
Christian.

>   
>   	if (amdgpu_sriov_vf(adev)) {
>   		r = vcn_v3_0_start_sriov(adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> index 832d15f7b5f6..9be7ae7af4b1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
> @@ -253,7 +253,7 @@ static int vcn_v4_0_hw_init(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	struct amdgpu_ring *ring;
> -	int i, r;
> +	int i, r = 0;
>   
>   	if (amdgpu_sriov_vf(adev)) {
>   		r = vcn_v4_0_start_sriov(adev);
> 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 501e53e69f2a..593c64e4b8ef 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
> @@ -221,7 +221,7 @@ static int vcn_v4_0_5_hw_init(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	struct amdgpu_ring *ring;
> -	int i, r;
> +	int i, r = 0;
>   
>   	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>   		if (adev->vcn.harvest_config & (1 << i))
> 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 bc60c554eb32..246f967e2e7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
> @@ -187,7 +187,7 @@ static int vcn_v5_0_0_hw_init(void *handle)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>   	struct amdgpu_ring *ring;
> -	int i, r;
> +	int i, r = 0;
>   
>   	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
>   		if (adev->vcn.harvest_config & (1 << i))



More information about the amd-gfx mailing list