aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Zhu <James.Zhu@amd.com>2018-10-16 10:06:00 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-10-17 17:13:07 -0400
commit8e16695b4eb819881774b8c06eb164dc1fb74275 (patch)
treed83ba41f4b54d0429879a619ca238ad980eade82
parentd344b21bf405eed05963627bfed6dd3df422623c (diff)
drm/amdgpu/vcn:Fix uninitialized symbol error
ret_code should be initialized with 0. The check of read/write ptr should be activate when UVD_POWER_STATUS_TILES is off. Signed-off-by: James Zhu <James.Zhu@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index bc6470668057..eae90922fdbe 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -1165,14 +1165,14 @@ static int vcn_v1_0_stop_spg_mode(struct amdgpu_device *adev)
1165 1165
1166static int vcn_v1_0_stop_dpg_mode(struct amdgpu_device *adev) 1166static int vcn_v1_0_stop_dpg_mode(struct amdgpu_device *adev)
1167{ 1167{
1168 int ret_code; 1168 int ret_code = 0;
1169 1169
1170 /* Wait for power status to be UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF */ 1170 /* Wait for power status to be UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF */
1171 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, 1171 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS,
1172 UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF, 1172 UVD_POWER_STATUS__UVD_POWER_STATUS_TILES_OFF,
1173 UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); 1173 UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);
1174 1174
1175 if (ret_code) { 1175 if (!ret_code) {
1176 int tmp = RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR) & 0x7FFFFFFF; 1176 int tmp = RREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR) & 0x7FFFFFFF;
1177 /* wait for read ptr to be equal to write ptr */ 1177 /* wait for read ptr to be equal to write ptr */
1178 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_RBC_RB_RPTR, tmp, 0xFFFFFFFF, ret_code); 1178 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_RBC_RB_RPTR, tmp, 0xFFFFFFFF, ret_code);