diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vi.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 4034a2863226..4ac1288ab7df 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c | |||
@@ -305,9 +305,10 @@ static void vi_init_golden_registers(struct amdgpu_device *adev) | |||
305 | stoney_mgcg_cgcg_init, | 305 | stoney_mgcg_cgcg_init, |
306 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); | 306 | ARRAY_SIZE(stoney_mgcg_cgcg_init)); |
307 | break; | 307 | break; |
308 | case CHIP_POLARIS11: | ||
309 | case CHIP_POLARIS10: | 308 | case CHIP_POLARIS10: |
309 | case CHIP_POLARIS11: | ||
310 | case CHIP_POLARIS12: | 310 | case CHIP_POLARIS12: |
311 | case CHIP_VEGAM: | ||
311 | default: | 312 | default: |
312 | break; | 313 | break; |
313 | } | 314 | } |
@@ -1096,6 +1097,30 @@ static int vi_common_early_init(void *handle) | |||
1096 | adev->pg_flags = 0; | 1097 | adev->pg_flags = 0; |
1097 | adev->external_rev_id = adev->rev_id + 0x64; | 1098 | adev->external_rev_id = adev->rev_id + 0x64; |
1098 | break; | 1099 | break; |
1100 | case CHIP_VEGAM: | ||
1101 | adev->cg_flags = 0; | ||
1102 | /*AMD_CG_SUPPORT_GFX_MGCG | | ||
1103 | AMD_CG_SUPPORT_GFX_RLC_LS | | ||
1104 | AMD_CG_SUPPORT_GFX_CP_LS | | ||
1105 | AMD_CG_SUPPORT_GFX_CGCG | | ||
1106 | AMD_CG_SUPPORT_GFX_CGLS | | ||
1107 | AMD_CG_SUPPORT_GFX_3D_CGCG | | ||
1108 | AMD_CG_SUPPORT_GFX_3D_CGLS | | ||
1109 | AMD_CG_SUPPORT_SDMA_MGCG | | ||
1110 | AMD_CG_SUPPORT_SDMA_LS | | ||
1111 | AMD_CG_SUPPORT_BIF_MGCG | | ||
1112 | AMD_CG_SUPPORT_BIF_LS | | ||
1113 | AMD_CG_SUPPORT_HDP_MGCG | | ||
1114 | AMD_CG_SUPPORT_HDP_LS | | ||
1115 | AMD_CG_SUPPORT_ROM_MGCG | | ||
1116 | AMD_CG_SUPPORT_MC_MGCG | | ||
1117 | AMD_CG_SUPPORT_MC_LS | | ||
1118 | AMD_CG_SUPPORT_DRM_LS | | ||
1119 | AMD_CG_SUPPORT_UVD_MGCG | | ||
1120 | AMD_CG_SUPPORT_VCE_MGCG;*/ | ||
1121 | adev->pg_flags = 0; | ||
1122 | adev->external_rev_id = adev->rev_id + 0x6E; | ||
1123 | break; | ||
1099 | case CHIP_CARRIZO: | 1124 | case CHIP_CARRIZO: |
1100 | adev->cg_flags = AMD_CG_SUPPORT_UVD_MGCG | | 1125 | adev->cg_flags = AMD_CG_SUPPORT_UVD_MGCG | |
1101 | AMD_CG_SUPPORT_GFX_MGCG | | 1126 | AMD_CG_SUPPORT_GFX_MGCG | |
@@ -1487,6 +1512,7 @@ static int vi_common_set_clockgating_state(void *handle, | |||
1487 | case CHIP_POLARIS10: | 1512 | case CHIP_POLARIS10: |
1488 | case CHIP_POLARIS11: | 1513 | case CHIP_POLARIS11: |
1489 | case CHIP_POLARIS12: | 1514 | case CHIP_POLARIS12: |
1515 | case CHIP_VEGAM: | ||
1490 | vi_common_set_clockgating_state_by_smu(adev, state); | 1516 | vi_common_set_clockgating_state_by_smu(adev, state); |
1491 | default: | 1517 | default: |
1492 | break; | 1518 | break; |
@@ -1616,9 +1642,10 @@ int vi_set_ip_blocks(struct amdgpu_device *adev) | |||
1616 | amdgpu_device_ip_block_add(adev, &vce_v3_0_ip_block); | 1642 | amdgpu_device_ip_block_add(adev, &vce_v3_0_ip_block); |
1617 | } | 1643 | } |
1618 | break; | 1644 | break; |
1619 | case CHIP_POLARIS11: | ||
1620 | case CHIP_POLARIS10: | 1645 | case CHIP_POLARIS10: |
1646 | case CHIP_POLARIS11: | ||
1621 | case CHIP_POLARIS12: | 1647 | case CHIP_POLARIS12: |
1648 | case CHIP_VEGAM: | ||
1622 | amdgpu_device_ip_block_add(adev, &vi_common_ip_block); | 1649 | amdgpu_device_ip_block_add(adev, &vi_common_ip_block); |
1623 | amdgpu_device_ip_block_add(adev, &gmc_v8_1_ip_block); | 1650 | amdgpu_device_ip_block_add(adev, &gmc_v8_1_ip_block); |
1624 | amdgpu_device_ip_block_add(adev, &tonga_ih_ip_block); | 1651 | amdgpu_device_ip_block_add(adev, &tonga_ih_ip_block); |