|
@@ -2437,27 +2437,48 @@ int radeon_asic_init(struct radeon_device *rdev)
|
|
|
}
|
|
|
break;
|
|
|
case CHIP_BONAIRE:
|
|
|
+ case CHIP_HAWAII:
|
|
|
rdev->asic = &ci_asic;
|
|
|
rdev->num_crtc = 6;
|
|
|
rdev->has_uvd = true;
|
|
|
- rdev->cg_flags =
|
|
|
- RADEON_CG_SUPPORT_GFX_MGCG |
|
|
|
- RADEON_CG_SUPPORT_GFX_MGLS |
|
|
|
- /*RADEON_CG_SUPPORT_GFX_CGCG |*/
|
|
|
- RADEON_CG_SUPPORT_GFX_CGLS |
|
|
|
- RADEON_CG_SUPPORT_GFX_CGTS |
|
|
|
- RADEON_CG_SUPPORT_GFX_CGTS_LS |
|
|
|
- RADEON_CG_SUPPORT_GFX_CP_LS |
|
|
|
- RADEON_CG_SUPPORT_MC_LS |
|
|
|
- RADEON_CG_SUPPORT_MC_MGCG |
|
|
|
- RADEON_CG_SUPPORT_SDMA_MGCG |
|
|
|
- RADEON_CG_SUPPORT_SDMA_LS |
|
|
|
- RADEON_CG_SUPPORT_BIF_LS |
|
|
|
- RADEON_CG_SUPPORT_VCE_MGCG |
|
|
|
- RADEON_CG_SUPPORT_UVD_MGCG |
|
|
|
- RADEON_CG_SUPPORT_HDP_LS |
|
|
|
- RADEON_CG_SUPPORT_HDP_MGCG;
|
|
|
- rdev->pg_flags = 0;
|
|
|
+ if (rdev->family == CHIP_BONAIRE) {
|
|
|
+ rdev->cg_flags =
|
|
|
+ RADEON_CG_SUPPORT_GFX_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_GFX_MGLS |
|
|
|
+ /*RADEON_CG_SUPPORT_GFX_CGCG |*/
|
|
|
+ RADEON_CG_SUPPORT_GFX_CGLS |
|
|
|
+ RADEON_CG_SUPPORT_GFX_CGTS |
|
|
|
+ RADEON_CG_SUPPORT_GFX_CGTS_LS |
|
|
|
+ RADEON_CG_SUPPORT_GFX_CP_LS |
|
|
|
+ RADEON_CG_SUPPORT_MC_LS |
|
|
|
+ RADEON_CG_SUPPORT_MC_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_SDMA_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_SDMA_LS |
|
|
|
+ RADEON_CG_SUPPORT_BIF_LS |
|
|
|
+ RADEON_CG_SUPPORT_VCE_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_UVD_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_HDP_LS |
|
|
|
+ RADEON_CG_SUPPORT_HDP_MGCG;
|
|
|
+ rdev->pg_flags = 0;
|
|
|
+ } else {
|
|
|
+ rdev->cg_flags =
|
|
|
+ RADEON_CG_SUPPORT_GFX_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_GFX_MGLS |
|
|
|
+ /*RADEON_CG_SUPPORT_GFX_CGCG |*/
|
|
|
+ RADEON_CG_SUPPORT_GFX_CGLS |
|
|
|
+ RADEON_CG_SUPPORT_GFX_CGTS |
|
|
|
+ RADEON_CG_SUPPORT_GFX_CP_LS |
|
|
|
+ RADEON_CG_SUPPORT_MC_LS |
|
|
|
+ RADEON_CG_SUPPORT_MC_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_SDMA_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_SDMA_LS |
|
|
|
+ RADEON_CG_SUPPORT_BIF_LS |
|
|
|
+ RADEON_CG_SUPPORT_VCE_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_UVD_MGCG |
|
|
|
+ RADEON_CG_SUPPORT_HDP_LS |
|
|
|
+ RADEON_CG_SUPPORT_HDP_MGCG;
|
|
|
+ rdev->pg_flags = 0;
|
|
|
+ }
|
|
|
break;
|
|
|
case CHIP_KAVERI:
|
|
|
case CHIP_KABINI:
|