Skip to content

Commit 451cd07

Browse files
pldrcgregkh
authored andcommitted
drm/amdgpu: Fix unintended error log in VCN5_0_0
commit 46b0e6b upstream. The error log is supposed to be gaurded under if failure condition. Fixes: faab5ea ("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>
1 parent 3f916a9 commit 451cd07

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,9 +721,10 @@ static int vcn_v5_0_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
721721

722722
if (indirect) {
723723
ret = amdgpu_vcn_psp_update_sram(adev, inst_idx, 0);
724-
dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret);
725-
if (ret)
724+
if (ret) {
725+
dev_err(adev->dev, "%s: vcn sram load failed %d\n", __func__, ret);
726726
return ret;
727+
}
727728
}
728729

729730
ring = &adev->vcn.inst[inst_idx].ring_enc[0];

0 commit comments

Comments
 (0)