Ver Fonte

drm/radeon: enable mgcg on CIK

Now that the CP is no longer reset and cg is properly
disabled in when appropriate in the dpm code we can
now enable mgcg (medium grained clockgating).

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher há 12 anos atrás
pai
commit
773dc10a8a
1 ficheiros alterados com 3 adições e 3 exclusões
  1. 3 3
      drivers/gpu/drm/radeon/radeon_asic.c

+ 3 - 3
drivers/gpu/drm/radeon/radeon_asic.c

@@ -2439,7 +2439,7 @@ int radeon_asic_init(struct radeon_device *rdev)
 		rdev->num_crtc = 6;
 		rdev->num_crtc = 6;
 		rdev->has_uvd = true;
 		rdev->has_uvd = true;
 		rdev->cg_flags =
 		rdev->cg_flags =
-			/*RADEON_CG_SUPPORT_GFX_MGCG |*/
+			RADEON_CG_SUPPORT_GFX_MGCG |
 			RADEON_CG_SUPPORT_GFX_MGLS |
 			RADEON_CG_SUPPORT_GFX_MGLS |
 			/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 			/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 			RADEON_CG_SUPPORT_GFX_CGLS |
 			RADEON_CG_SUPPORT_GFX_CGLS |
@@ -2464,7 +2464,7 @@ int radeon_asic_init(struct radeon_device *rdev)
 		if (rdev->family == CHIP_KAVERI) {
 		if (rdev->family == CHIP_KAVERI) {
 			rdev->num_crtc = 4;
 			rdev->num_crtc = 4;
 			rdev->cg_flags =
 			rdev->cg_flags =
-				/*RADEON_CG_SUPPORT_GFX_MGCG |*/
+				RADEON_CG_SUPPORT_GFX_MGCG |
 				RADEON_CG_SUPPORT_GFX_MGLS |
 				RADEON_CG_SUPPORT_GFX_MGLS |
 				/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 				/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 				RADEON_CG_SUPPORT_GFX_CGLS |
 				RADEON_CG_SUPPORT_GFX_CGLS |
@@ -2492,7 +2492,7 @@ int radeon_asic_init(struct radeon_device *rdev)
 		} else {
 		} else {
 			rdev->num_crtc = 2;
 			rdev->num_crtc = 2;
 			rdev->cg_flags =
 			rdev->cg_flags =
-				/*RADEON_CG_SUPPORT_GFX_MGCG |*/
+				RADEON_CG_SUPPORT_GFX_MGCG |
 				RADEON_CG_SUPPORT_GFX_MGLS |
 				RADEON_CG_SUPPORT_GFX_MGLS |
 				/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 				/*RADEON_CG_SUPPORT_GFX_CGCG |*/
 				RADEON_CG_SUPPORT_GFX_CGLS |
 				RADEON_CG_SUPPORT_GFX_CGLS |