diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2013-08-19 18:02:26 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2013-11-08 12:33:47 -0500 |
| commit | 41971b37d19d3f44620dd54671e1084d0dccfe37 (patch) | |
| tree | bc73014dfd991438cd0a8a6b2c344735412c2ec2 | |
| parent | 7eeeabfcce9249b21eff1cf5f7ec3621de5d14e4 (diff) | |
drm/radeon: fill in radeon_asic_init for hawaii
Fill in gpu details for hawaii.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index d4b91675671d..50853c0cb49d 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -2437,27 +2437,48 @@ int radeon_asic_init(struct radeon_device *rdev) | |||
| 2437 | } | 2437 | } |
| 2438 | break; | 2438 | break; |
| 2439 | case CHIP_BONAIRE: | 2439 | case CHIP_BONAIRE: |
| 2440 | case CHIP_HAWAII: | ||
| 2440 | rdev->asic = &ci_asic; | 2441 | rdev->asic = &ci_asic; |
| 2441 | rdev->num_crtc = 6; | 2442 | rdev->num_crtc = 6; |
| 2442 | rdev->has_uvd = true; | 2443 | rdev->has_uvd = true; |
| 2443 | rdev->cg_flags = | 2444 | if (rdev->family == CHIP_BONAIRE) { |
| 2444 | RADEON_CG_SUPPORT_GFX_MGCG | | 2445 | rdev->cg_flags = |
| 2445 | RADEON_CG_SUPPORT_GFX_MGLS | | 2446 | RADEON_CG_SUPPORT_GFX_MGCG | |
| 2446 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ | 2447 | RADEON_CG_SUPPORT_GFX_MGLS | |
| 2447 | RADEON_CG_SUPPORT_GFX_CGLS | | 2448 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ |
| 2448 | RADEON_CG_SUPPORT_GFX_CGTS | | 2449 | RADEON_CG_SUPPORT_GFX_CGLS | |
| 2449 | RADEON_CG_SUPPORT_GFX_CGTS_LS | | 2450 | RADEON_CG_SUPPORT_GFX_CGTS | |
| 2450 | RADEON_CG_SUPPORT_GFX_CP_LS | | 2451 | RADEON_CG_SUPPORT_GFX_CGTS_LS | |
| 2451 | RADEON_CG_SUPPORT_MC_LS | | 2452 | RADEON_CG_SUPPORT_GFX_CP_LS | |
| 2452 | RADEON_CG_SUPPORT_MC_MGCG | | 2453 | RADEON_CG_SUPPORT_MC_LS | |
| 2453 | RADEON_CG_SUPPORT_SDMA_MGCG | | 2454 | RADEON_CG_SUPPORT_MC_MGCG | |
| 2454 | RADEON_CG_SUPPORT_SDMA_LS | | 2455 | RADEON_CG_SUPPORT_SDMA_MGCG | |
| 2455 | RADEON_CG_SUPPORT_BIF_LS | | 2456 | RADEON_CG_SUPPORT_SDMA_LS | |
| 2456 | RADEON_CG_SUPPORT_VCE_MGCG | | 2457 | RADEON_CG_SUPPORT_BIF_LS | |
| 2457 | RADEON_CG_SUPPORT_UVD_MGCG | | 2458 | RADEON_CG_SUPPORT_VCE_MGCG | |
| 2458 | RADEON_CG_SUPPORT_HDP_LS | | 2459 | RADEON_CG_SUPPORT_UVD_MGCG | |
| 2459 | RADEON_CG_SUPPORT_HDP_MGCG; | 2460 | RADEON_CG_SUPPORT_HDP_LS | |
| 2460 | rdev->pg_flags = 0; | 2461 | RADEON_CG_SUPPORT_HDP_MGCG; |
| 2462 | rdev->pg_flags = 0; | ||
| 2463 | } else { | ||
| 2464 | rdev->cg_flags = | ||
| 2465 | RADEON_CG_SUPPORT_GFX_MGCG | | ||
| 2466 | RADEON_CG_SUPPORT_GFX_MGLS | | ||
| 2467 | /*RADEON_CG_SUPPORT_GFX_CGCG |*/ | ||
| 2468 | RADEON_CG_SUPPORT_GFX_CGLS | | ||
| 2469 | RADEON_CG_SUPPORT_GFX_CGTS | | ||
| 2470 | RADEON_CG_SUPPORT_GFX_CP_LS | | ||
| 2471 | RADEON_CG_SUPPORT_MC_LS | | ||
| 2472 | RADEON_CG_SUPPORT_MC_MGCG | | ||
| 2473 | RADEON_CG_SUPPORT_SDMA_MGCG | | ||
| 2474 | RADEON_CG_SUPPORT_SDMA_LS | | ||
| 2475 | RADEON_CG_SUPPORT_BIF_LS | | ||
| 2476 | RADEON_CG_SUPPORT_VCE_MGCG | | ||
| 2477 | RADEON_CG_SUPPORT_UVD_MGCG | | ||
| 2478 | RADEON_CG_SUPPORT_HDP_LS | | ||
| 2479 | RADEON_CG_SUPPORT_HDP_MGCG; | ||
| 2480 | rdev->pg_flags = 0; | ||
| 2481 | } | ||
| 2461 | break; | 2482 | break; |
| 2462 | case CHIP_KAVERI: | 2483 | case CHIP_KAVERI: |
| 2463 | case CHIP_KABINI: | 2484 | case CHIP_KABINI: |