diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2013-08-14 18:58:43 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-08-30 16:30:58 -0400 |
commit | 773dc10a8acd28c19947b557094d4c1ec0043998 (patch) | |
tree | 9feaf191907840e48eb5463bc6b75d19c637a488 /drivers/gpu/drm/radeon/radeon_asic.c | |
parent | 6500fc0c9fd9a0c3cde1b498541a259d1ba078ba (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index 6152169d011f..630853b96841 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
@@ -2439,7 +2439,7 @@ int radeon_asic_init(struct radeon_device *rdev) | |||
2439 | rdev->num_crtc = 6; | 2439 | rdev->num_crtc = 6; |
2440 | rdev->has_uvd = true; | 2440 | rdev->has_uvd = true; |
2441 | rdev->cg_flags = | 2441 | rdev->cg_flags = |
2442 | /*RADEON_CG_SUPPORT_GFX_MGCG |*/ | 2442 | RADEON_CG_SUPPORT_GFX_MGCG | |
2443 | RADEON_CG_SUPPORT_GFX_MGLS | | 2443 | RADEON_CG_SUPPORT_GFX_MGLS | |
2444 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ | 2444 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ |
2445 | RADEON_CG_SUPPORT_GFX_CGLS | | 2445 | RADEON_CG_SUPPORT_GFX_CGLS | |
@@ -2464,7 +2464,7 @@ int radeon_asic_init(struct radeon_device *rdev) | |||
2464 | if (rdev->family == CHIP_KAVERI) { | 2464 | if (rdev->family == CHIP_KAVERI) { |
2465 | rdev->num_crtc = 4; | 2465 | rdev->num_crtc = 4; |
2466 | rdev->cg_flags = | 2466 | rdev->cg_flags = |
2467 | /*RADEON_CG_SUPPORT_GFX_MGCG |*/ | 2467 | RADEON_CG_SUPPORT_GFX_MGCG | |
2468 | RADEON_CG_SUPPORT_GFX_MGLS | | 2468 | RADEON_CG_SUPPORT_GFX_MGLS | |
2469 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ | 2469 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ |
2470 | RADEON_CG_SUPPORT_GFX_CGLS | | 2470 | RADEON_CG_SUPPORT_GFX_CGLS | |
@@ -2492,7 +2492,7 @@ int radeon_asic_init(struct radeon_device *rdev) | |||
2492 | } else { | 2492 | } else { |
2493 | rdev->num_crtc = 2; | 2493 | rdev->num_crtc = 2; |
2494 | rdev->cg_flags = | 2494 | rdev->cg_flags = |
2495 | /*RADEON_CG_SUPPORT_GFX_MGCG |*/ | 2495 | RADEON_CG_SUPPORT_GFX_MGCG | |
2496 | RADEON_CG_SUPPORT_GFX_MGLS | | 2496 | RADEON_CG_SUPPORT_GFX_MGLS | |
2497 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ | 2497 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ |
2498 | RADEON_CG_SUPPORT_GFX_CGLS | | 2498 | RADEON_CG_SUPPORT_GFX_CGLS | |