[AMD Official Use Only - General]

Reviewed-by: Lijo Lazar <[email protected]>

Thanks,
Lijo

-----Original Message-----
From: SHANMUGAM, SRINIVASAN <[email protected]> 
Sent: Friday, May 19, 2023 10:28 AM
To: Koenig, Christian <[email protected]>; Deucher, Alexander 
<[email protected]>; Tuikov, Luben <[email protected]>; Lazar, Lijo 
<[email protected]>; Zhang, Hawking <[email protected]>
Cc: [email protected]; SHANMUGAM, SRINIVASAN 
<[email protected]>
Subject: [PATCH] drm/amdgpu: Fix uninitialized variable in 
gfxhub_v1_2_xcp_resume

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c:657:6: error: variable 'ret' is used 
uninitialized whenever 'if' condition is false 
[-Werror,-Wsometimes-uninitialized]
        if (!amdgpu_sriov_vf(adev))
            ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c:660:9: note: uninitialized use occurs 
here
        return ret;
               ^~~
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c:657:2: note: remove the 'if' if its 
condition is always true
        if (!amdgpu_sriov_vf(adev))
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c:648:9: note: initialize the variable 
'ret' to silence this warning
        int ret;
               ^
                = 0
1 error generated.

Cc: Luben Tuikov <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: Christian König <[email protected]>
Cc: Lijo Lazar <[email protected]>
Cc: Hawking Zhang <[email protected]>
Signed-off-by: Srinivasan Shanmugam <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c 
b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
index 8901e73fd700..4dabf910334b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c
@@ -645,7 +645,6 @@ static int gfxhub_v1_2_xcp_resume(void *handle, uint32_t 
inst_mask)  {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        bool value;
-       int ret;
 
        if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_ALWAYS)
                value = false;
@@ -655,9 +654,9 @@ static int gfxhub_v1_2_xcp_resume(void *handle, uint32_t 
inst_mask)
        gfxhub_v1_2_xcc_set_fault_enable_default(adev, value, inst_mask);
 
        if (!amdgpu_sriov_vf(adev))
-               ret = gfxhub_v1_2_xcc_gart_enable(adev, inst_mask);
+               return gfxhub_v1_2_xcc_gart_enable(adev, inst_mask);
 
-       return ret;
+       return 0;
 }
 
 static int gfxhub_v1_2_xcp_suspend(void *handle, uint32_t inst_mask)
--
2.25.1

Reply via email to