UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/amdgpu: Fix flow control in uvd_v4_2_stop() 

Break out of outer loop properly.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2017-02-13 14:11:40 -05:00 committed by Alex Deucher
parent fce293ca3d
commit e89d5b5c20
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
View File

@ -401,7 +401,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
break; break;
mdelay(1); mdelay(1);
} }
break; if (status & 2)
break;
} }
for (i = 0; i < 10; ++i) { for (i = 0; i < 10; ++i) {
@ -411,7 +412,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
break; break;
mdelay(1); mdelay(1);
} }
break; if (status & 0xf)
break;
} }
/* Stall UMC and register bus before resetting VCPU */ /* Stall UMC and register bus before resetting VCPU */
@ -424,7 +426,8 @@ static void uvd_v4_2_stop(struct amdgpu_device *adev)
break; break;
mdelay(1); mdelay(1);
} }
break; if (status & 0x240)
break;
} }
WREG32_P(0x3D49, 0, ~(1 << 2)); WREG32_P(0x3D49, 0, ~(1 << 2));