]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu: Fix unintended error log in VCN5_0_0
authorSathishkumar S <sathishkumar.sundararaju@amd.com>
Mon, 28 Jul 2025 12:57:06 +0000 (18:27 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:37:48 +0000 (15:37 -0500)
commit 46b0e6b9d749cfa891e6969d6565be1131c53aa2 upstream.

The error log is supposed to be gaurded under if failure condition.

Fixes: faab5ea08367 ("drm/amdgpu: Check vcn sram load return value")
Signed-off-by: Sathishkumar S <sathishkumar.sundararaju@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c

index f8bb90fe764bbca36d7cf33f32a422a81b386234..f9dbd2757d836e0576a8ddd12060491b29cac912 100644 (file)
@@ -769,9 +769,10 @@ static int vcn_v5_0_0_start_dpg_mode(struct amdgpu_vcn_inst *vinst,
 
        if (indirect) {
                ret = amdgpu_vcn_psp_update_sram(adev, inst_idx, 0);
-               dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret);
-               if (ret)
+               if (ret) {
+                       dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret);
                        return ret;
+               }
        }
 
        ring = &adev->vcn.inst[inst_idx].ring_enc[0];