public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amd/amdgpu: Partially revert change to UVD v3 CG

Browse source 
Partially undo changes made by commit:

drm/amd/amdgpu: don't track state in UVD clockgating

To keep bypass even if CG flags are not set.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2016-08-03 12:37:23 -04:00 • committed by Alex Deucher
parent 8ef583e9f9
commit 568ba157cd
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
View file

@ -960,13 +960,13 @@ static int uvd_v6_0_set_clockgating_state(void *handle,
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
if (!(adev->cg_flags & AMD_CG_SUPPORT_UVD_MGCG))
return 0;
if (adev->asic_type == CHIP_FIJI || if (adev->asic_type == CHIP_FIJI ||
adev->asic_type == CHIP_POLARIS10) adev->asic_type == CHIP_POLARIS10)
uvd_v6_set_bypass_mode(adev, state == AMD_CG_STATE_GATE ? true : false); uvd_v6_set_bypass_mode(adev, state == AMD_CG_STATE_GATE ? true : false);
if (!(adev->cg_flags & AMD_CG_SUPPORT_UVD_MGCG))
return 0;
if (state == AMD_CG_STATE_GATE) { if (state == AMD_CG_STATE_GATE) {
/* disable HW gating and enable Sw gating */ /* disable HW gating and enable Sw gating */
uvd_v6_0_set_sw_clock_gating(adev); uvd_v6_0_set_sw_clock_gating(adev);