summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSathishkumar S <sathishkumar.sundararaju@amd.com>2025-07-28 18:27:06 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-11-13 15:34:41 -0500
commit451cd07a8f9d457b0d5409c0c80b93887c21522d (patch)
treef41575bf1b3969b7c4604b9ac6b9931c1619f6f6
parent3f916a93fc59895a5b18a604cf06ffb9ad96c3c7 (diff)
downloadlinux-451cd07a8f9d457b0d5409c0c80b93887c21522d.tar.gz
linux-451cd07a8f9d457b0d5409c0c80b93887c21522d.tar.bz2
linux-451cd07a8f9d457b0d5409c0c80b93887c21522d.zip
drm/amdgpu: Fix unintended error log in VCN5_0_0
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c5
1 files changed, 3 insertions, 2 deletions
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 cc7add217fd1..a359d612182d 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
@@ -721,9 +721,10 @@ static int vcn_v5_0_0_start_dpg_mode(struct amdgpu_device *adev, int inst_idx, b
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];