Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568ba157 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

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



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: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ef583e9

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

+3 −3
Original line number Diff line number Diff line
@@ -960,13 +960,13 @@ static int uvd_v6_0_set_clockgating_state(void *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 ||

	    adev->asic_type == CHIP_POLARIS10)

		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) {

		/* disable HW gating and enable Sw gating */

		uvd_v6_0_set_sw_clock_gating(adev);