summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJames Zhu <James.Zhu@amd.com>2018-12-12 14:46:10 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-12-18 17:38:24 -0500
commit5d65cab6c614f95549b19416b2aad824c6d9283a (patch)
treec7e06abb4e2e66d77b46aaea60d0f2713883897a /drivers/gpu
parentf9872f100aefd3b80eb4a61dbea326ee28cdc94a (diff)
downloadlinux-5d65cab6c614f95549b19416b2aad824c6d9283a.tar.gz
linux-5d65cab6c614f95549b19416b2aad824c6d9283a.tar.bz2
linux-5d65cab6c614f95549b19416b2aad824c6d9283a.zip
drm/amdgpu/vcn:Always gate vcn block during hw finishing
Under Dynamic Power Gate mode, UVD_STATUS needn't be checked. Signed-off-by: James Zhu <James.Zhu@amd.com> Acked-by: Leo Liu <leo.liu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 4f8352044563..775204315888 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -214,7 +214,8 @@ static int vcn_v1_0_hw_fini(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
struct amdgpu_ring *ring = &adev->vcn.ring_dec;
- if (RREG32_SOC15(VCN, 0, mmUVD_STATUS))
+ if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) ||
+ RREG32_SOC15(VCN, 0, mmUVD_STATUS))
vcn_v1_0_set_powergating_state(adev, AMD_PG_STATE_GATE);
ring->sched.ready = false;