Commit f917c2ad authored by Colin Ian King's avatar Colin Ian King Committed by Alex Deucher

drm/amdgpu: remove redundant outer loop and remove commented out code

The outer loop is redundant and can be removed as it is doing nothing
useful. Also remove some commented out code that is not being used.

Detected by CoverityScan, CID#1402073
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 153de9df
...@@ -274,24 +274,14 @@ static int vce_v2_0_start(struct amdgpu_device *adev) ...@@ -274,24 +274,14 @@ static int vce_v2_0_start(struct amdgpu_device *adev)
static int vce_v2_0_stop(struct amdgpu_device *adev) static int vce_v2_0_stop(struct amdgpu_device *adev)
{ {
int i, j; int i;
int status; int status;
if (vce_v2_0_lmi_clean(adev)) { if (vce_v2_0_lmi_clean(adev)) {
DRM_INFO("vce is not idle \n"); DRM_INFO("vce is not idle \n");
return 0; return 0;
} }
/*
for (i = 0; i < 10; ++i) {
for (j = 0; j < 100; ++j) {
status = RREG32(mmVCE_FW_REG_STATUS);
if (!(status & 1))
break;
mdelay(1);
}
break;
}
*/
if (vce_v2_0_wait_for_idle(adev)) { if (vce_v2_0_wait_for_idle(adev)) {
DRM_INFO("VCE is busy, Can't set clock gateing"); DRM_INFO("VCE is busy, Can't set clock gateing");
return 0; return 0;
...@@ -300,14 +290,11 @@ static int vce_v2_0_stop(struct amdgpu_device *adev) ...@@ -300,14 +290,11 @@ static int vce_v2_0_stop(struct amdgpu_device *adev)
/* Stall UMC and register bus before resetting VCPU */ /* Stall UMC and register bus before resetting VCPU */
WREG32_P(mmVCE_LMI_CTRL2, 1 << 8, ~(1 << 8)); WREG32_P(mmVCE_LMI_CTRL2, 1 << 8, ~(1 << 8));
for (i = 0; i < 10; ++i) { for (i = 0; i < 100; ++i) {
for (j = 0; j < 100; ++j) { status = RREG32(mmVCE_LMI_STATUS);
status = RREG32(mmVCE_LMI_STATUS); if (status & 0x240)
if (status & 0x240) break;
break; mdelay(1);
mdelay(1);
}
break;
} }
WREG32_P(mmVCE_VCPU_CNTL, 0, ~0x80001); WREG32_P(mmVCE_VCPU_CNTL, 0, ~0x80001);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment