]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu/vcn2: don't access register when power gated
authorJack Xiao <Jack.Xiao@amd.com>
Thu, 18 Apr 2019 09:37:14 +0000 (17:37 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 21 Jun 2019 23:59:27 +0000 (18:59 -0500)
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>
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c

index 36a80e487b8d7d0799dd4d5849fe08c4d25efaa8..04cac0bb59007a95235e17e89f1b38d7a66c4806 100644 (file)
@@ -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;