diff options
| author | Jack Xiao <Jack.Xiao@amd.com> | 2019-04-18 17:37:14 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-21 18:59:27 -0500 |
| commit | 0b8794e252fcf47d840985dde1d7a4f8802b61a7 (patch) | |
| tree | 8db5f25c5459002a62ea2511723218bd2fa21658 /drivers/gpu/drm/amd/amdgpu | |
| parent | a8179d62fbbd1e6fd73690fe0888f9471c5d7e94 (diff) | |
| download | kernel_replicant_linux-0b8794e252fcf47d840985dde1d7a4f8802b61a7.tar.gz kernel_replicant_linux-0b8794e252fcf47d840985dde1d7a4f8802b61a7.tar.bz2 kernel_replicant_linux-0b8794e252fcf47d840985dde1d7a4f8802b61a7.zip | |
drm/amdgpu/vcn2: don't access register when power gated
It will cause bus hang to access register UVD_STATUS
when VCN is in the state of power gated.
Signed-off-by: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c index 36a80e487b8d..04cac0bb5900 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c @@ -277,7 +277,8 @@ static int vcn_v2_0_hw_fini(void *handle) struct amdgpu_ring *ring = &adev->vcn.ring_dec; int i; - if (RREG32_SOC15(VCN, 0, mmUVD_STATUS)) + if (adev->vcn.cur_state != AMD_PG_STATE_GATE && + RREG32_SOC15(VCN, 0, mmUVD_STATUS)) vcn_v2_0_set_powergating_state(adev, AMD_PG_STATE_GATE); ring->sched.ready = false; |