diff options
| author | Huang Rui <ray.huang@amd.com> | 2018-06-19 11:46:42 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-09-14 10:37:14 -0400 |
| commit | 520cbe0f4a7f170ec0d1167a827bcbec74aef4f4 (patch) | |
| tree | f3624dc0a17a5ca39d926b8e4b0215a51e4922db /drivers/gpu | |
| parent | 89da2a505f1bdbc34819a170435eb64e596bf5c6 (diff) | |
drm/amdgpu: set CG flags for raven2 (v2)
Raven2 does not enable all of the CG flags that raven1 does.
v2: rebase (Alex)
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.c | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c index 0a935604ec9e..f5a44d1fe5da 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.c +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c | |||
| @@ -714,26 +714,43 @@ static int soc15_common_early_init(void *handle) | |||
| 714 | adev->external_rev_id = adev->rev_id + 0x28; | 714 | adev->external_rev_id = adev->rev_id + 0x28; |
| 715 | break; | 715 | break; |
| 716 | case CHIP_RAVEN: | 716 | case CHIP_RAVEN: |
| 717 | adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG | | 717 | if (adev->rev_id >= 0x8) |
| 718 | AMD_CG_SUPPORT_GFX_MGLS | | 718 | adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG | |
| 719 | AMD_CG_SUPPORT_GFX_RLC_LS | | 719 | AMD_CG_SUPPORT_GFX_MGLS | |
| 720 | AMD_CG_SUPPORT_GFX_CP_LS | | 720 | AMD_CG_SUPPORT_GFX_CP_LS | |
| 721 | AMD_CG_SUPPORT_GFX_3D_CGCG | | 721 | AMD_CG_SUPPORT_GFX_3D_CGCG | |
| 722 | AMD_CG_SUPPORT_GFX_3D_CGLS | | 722 | AMD_CG_SUPPORT_GFX_3D_CGLS | |
| 723 | AMD_CG_SUPPORT_GFX_CGCG | | 723 | AMD_CG_SUPPORT_GFX_CGCG | |
| 724 | AMD_CG_SUPPORT_GFX_CGLS | | 724 | AMD_CG_SUPPORT_GFX_CGLS | |
| 725 | AMD_CG_SUPPORT_BIF_MGCG | | 725 | AMD_CG_SUPPORT_BIF_LS | |
| 726 | AMD_CG_SUPPORT_BIF_LS | | 726 | AMD_CG_SUPPORT_HDP_LS | |
| 727 | AMD_CG_SUPPORT_HDP_MGCG | | 727 | AMD_CG_SUPPORT_ROM_MGCG | |
| 728 | AMD_CG_SUPPORT_HDP_LS | | 728 | AMD_CG_SUPPORT_MC_MGCG | |
| 729 | AMD_CG_SUPPORT_DRM_MGCG | | 729 | AMD_CG_SUPPORT_MC_LS | |
| 730 | AMD_CG_SUPPORT_DRM_LS | | 730 | AMD_CG_SUPPORT_SDMA_MGCG | |
| 731 | AMD_CG_SUPPORT_ROM_MGCG | | 731 | AMD_CG_SUPPORT_SDMA_LS | |
| 732 | AMD_CG_SUPPORT_MC_MGCG | | 732 | AMD_CG_SUPPORT_VCN_MGCG; |
| 733 | AMD_CG_SUPPORT_MC_LS | | 733 | else |
| 734 | AMD_CG_SUPPORT_SDMA_MGCG | | 734 | adev->cg_flags = AMD_CG_SUPPORT_GFX_MGCG | |
| 735 | AMD_CG_SUPPORT_SDMA_LS | | 735 | AMD_CG_SUPPORT_GFX_MGLS | |
| 736 | AMD_CG_SUPPORT_VCN_MGCG; | 736 | AMD_CG_SUPPORT_GFX_RLC_LS | |
| 737 | AMD_CG_SUPPORT_GFX_CP_LS | | ||
| 738 | AMD_CG_SUPPORT_GFX_3D_CGCG | | ||
| 739 | AMD_CG_SUPPORT_GFX_3D_CGLS | | ||
| 740 | AMD_CG_SUPPORT_GFX_CGCG | | ||
| 741 | AMD_CG_SUPPORT_GFX_CGLS | | ||
| 742 | AMD_CG_SUPPORT_BIF_MGCG | | ||
| 743 | AMD_CG_SUPPORT_BIF_LS | | ||
| 744 | AMD_CG_SUPPORT_HDP_MGCG | | ||
| 745 | AMD_CG_SUPPORT_HDP_LS | | ||
| 746 | AMD_CG_SUPPORT_DRM_MGCG | | ||
| 747 | AMD_CG_SUPPORT_DRM_LS | | ||
| 748 | AMD_CG_SUPPORT_ROM_MGCG | | ||
| 749 | AMD_CG_SUPPORT_MC_MGCG | | ||
| 750 | AMD_CG_SUPPORT_MC_LS | | ||
| 751 | AMD_CG_SUPPORT_SDMA_MGCG | | ||
| 752 | AMD_CG_SUPPORT_SDMA_LS | | ||
| 753 | AMD_CG_SUPPORT_VCN_MGCG; | ||
| 737 | 754 | ||
| 738 | adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN; | 755 | adev->pg_flags = AMD_PG_SUPPORT_SDMA | AMD_PG_SUPPORT_VCN; |
| 739 | 756 | ||