Skip to contentSkip to conversation

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

PATCH In review Tom St Denis 2 participants 2 messages Aug 3, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +3 -3
index 391457f1eafd..c11b97f8e376 100644
@@ -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);
Signature · 6 lines
2.9.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by Alex Deucher
#2 lore raw
Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Wednesday, August 03, 2016 12:47 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/amdgpu: Partially revert change to UVD v3 CG

Quoted 7 lines

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.

Quoted 31 lines
---
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +3 -3
index 391457f1eafd..c11b97f8e376 100644
@@ -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) {
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0 -1
 		/* disable HW gating and enable Sw gating */
 		uvd_v6_0_set_sw_clock_gating(adev);
--

2.9.2

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx