aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/cik.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-03-13 19:42:34 -0400
committerDave Airlie <airlied@redhat.com>2016-03-13 19:46:02 -0400
commit9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch)
treed4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /drivers/gpu/drm/amd/amdgpu/cik.c
parent550e3b23a53c88adfa46e64f9d442743e65d47da (diff)
parent125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff)
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik.c157
1 files changed, 80 insertions, 77 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 6b1f0539ce9d..192ab13e9f05 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1462,6 +1462,9 @@ static void cik_program_aspm(struct amdgpu_device *adev)
1462 if (amdgpu_aspm == 0) 1462 if (amdgpu_aspm == 0)
1463 return; 1463 return;
1464 1464
1465 if (pci_is_root_bus(adev->pdev->bus))
1466 return;
1467
1465 /* XXX double check APUs */ 1468 /* XXX double check APUs */
1466 if (adev->flags & AMD_IS_APU) 1469 if (adev->flags & AMD_IS_APU)
1467 return; 1470 return;
@@ -2032,72 +2035,72 @@ static int cik_common_early_init(void *handle)
2032 switch (adev->asic_type) { 2035 switch (adev->asic_type) {
2033 case CHIP_BONAIRE: 2036 case CHIP_BONAIRE:
2034 adev->cg_flags = 2037 adev->cg_flags =
2035 AMDGPU_CG_SUPPORT_GFX_MGCG | 2038 AMD_CG_SUPPORT_GFX_MGCG |
2036 AMDGPU_CG_SUPPORT_GFX_MGLS | 2039 AMD_CG_SUPPORT_GFX_MGLS |
2037 /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ 2040 /*AMD_CG_SUPPORT_GFX_CGCG |*/
2038 AMDGPU_CG_SUPPORT_GFX_CGLS | 2041 AMD_CG_SUPPORT_GFX_CGLS |
2039 AMDGPU_CG_SUPPORT_GFX_CGTS | 2042 AMD_CG_SUPPORT_GFX_CGTS |
2040 AMDGPU_CG_SUPPORT_GFX_CGTS_LS | 2043 AMD_CG_SUPPORT_GFX_CGTS_LS |
2041 AMDGPU_CG_SUPPORT_GFX_CP_LS | 2044 AMD_CG_SUPPORT_GFX_CP_LS |
2042 AMDGPU_CG_SUPPORT_MC_LS | 2045 AMD_CG_SUPPORT_MC_LS |
2043 AMDGPU_CG_SUPPORT_MC_MGCG | 2046 AMD_CG_SUPPORT_MC_MGCG |
2044 AMDGPU_CG_SUPPORT_SDMA_MGCG | 2047 AMD_CG_SUPPORT_SDMA_MGCG |
2045 AMDGPU_CG_SUPPORT_SDMA_LS | 2048 AMD_CG_SUPPORT_SDMA_LS |
2046 AMDGPU_CG_SUPPORT_BIF_LS | 2049 AMD_CG_SUPPORT_BIF_LS |
2047 AMDGPU_CG_SUPPORT_VCE_MGCG | 2050 AMD_CG_SUPPORT_VCE_MGCG |
2048 AMDGPU_CG_SUPPORT_UVD_MGCG | 2051 AMD_CG_SUPPORT_UVD_MGCG |
2049 AMDGPU_CG_SUPPORT_HDP_LS | 2052 AMD_CG_SUPPORT_HDP_LS |
2050 AMDGPU_CG_SUPPORT_HDP_MGCG; 2053 AMD_CG_SUPPORT_HDP_MGCG;
2051 adev->pg_flags = 0; 2054 adev->pg_flags = 0;
2052 adev->external_rev_id = adev->rev_id + 0x14; 2055 adev->external_rev_id = adev->rev_id + 0x14;
2053 break; 2056 break;
2054 case CHIP_HAWAII: 2057 case CHIP_HAWAII:
2055 adev->cg_flags = 2058 adev->cg_flags =
2056 AMDGPU_CG_SUPPORT_GFX_MGCG | 2059 AMD_CG_SUPPORT_GFX_MGCG |
2057 AMDGPU_CG_SUPPORT_GFX_MGLS | 2060 AMD_CG_SUPPORT_GFX_MGLS |
2058 /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ 2061 /*AMD_CG_SUPPORT_GFX_CGCG |*/
2059 AMDGPU_CG_SUPPORT_GFX_CGLS | 2062 AMD_CG_SUPPORT_GFX_CGLS |
2060 AMDGPU_CG_SUPPORT_GFX_CGTS | 2063 AMD_CG_SUPPORT_GFX_CGTS |
2061 AMDGPU_CG_SUPPORT_GFX_CP_LS | 2064 AMD_CG_SUPPORT_GFX_CP_LS |
2062 AMDGPU_CG_SUPPORT_MC_LS | 2065 AMD_CG_SUPPORT_MC_LS |
2063 AMDGPU_CG_SUPPORT_MC_MGCG | 2066 AMD_CG_SUPPORT_MC_MGCG |
2064 AMDGPU_CG_SUPPORT_SDMA_MGCG | 2067 AMD_CG_SUPPORT_SDMA_MGCG |
2065 AMDGPU_CG_SUPPORT_SDMA_LS | 2068 AMD_CG_SUPPORT_SDMA_LS |
2066 AMDGPU_CG_SUPPORT_BIF_LS | 2069 AMD_CG_SUPPORT_BIF_LS |
2067 AMDGPU_CG_SUPPORT_VCE_MGCG | 2070 AMD_CG_SUPPORT_VCE_MGCG |
2068 AMDGPU_CG_SUPPORT_UVD_MGCG | 2071 AMD_CG_SUPPORT_UVD_MGCG |
2069 AMDGPU_CG_SUPPORT_HDP_LS | 2072 AMD_CG_SUPPORT_HDP_LS |
2070 AMDGPU_CG_SUPPORT_HDP_MGCG; 2073 AMD_CG_SUPPORT_HDP_MGCG;
2071 adev->pg_flags = 0; 2074 adev->pg_flags = 0;
2072 adev->external_rev_id = 0x28; 2075 adev->external_rev_id = 0x28;
2073 break; 2076 break;
2074 case CHIP_KAVERI: 2077 case CHIP_KAVERI:
2075 adev->cg_flags = 2078 adev->cg_flags =
2076 AMDGPU_CG_SUPPORT_GFX_MGCG | 2079 AMD_CG_SUPPORT_GFX_MGCG |
2077 AMDGPU_CG_SUPPORT_GFX_MGLS | 2080 AMD_CG_SUPPORT_GFX_MGLS |
2078 /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ 2081 /*AMD_CG_SUPPORT_GFX_CGCG |*/
2079 AMDGPU_CG_SUPPORT_GFX_CGLS | 2082 AMD_CG_SUPPORT_GFX_CGLS |
2080 AMDGPU_CG_SUPPORT_GFX_CGTS | 2083 AMD_CG_SUPPORT_GFX_CGTS |
2081 AMDGPU_CG_SUPPORT_GFX_CGTS_LS | 2084 AMD_CG_SUPPORT_GFX_CGTS_LS |
2082 AMDGPU_CG_SUPPORT_GFX_CP_LS | 2085 AMD_CG_SUPPORT_GFX_CP_LS |
2083 AMDGPU_CG_SUPPORT_SDMA_MGCG | 2086 AMD_CG_SUPPORT_SDMA_MGCG |
2084 AMDGPU_CG_SUPPORT_SDMA_LS | 2087 AMD_CG_SUPPORT_SDMA_LS |
2085 AMDGPU_CG_SUPPORT_BIF_LS | 2088 AMD_CG_SUPPORT_BIF_LS |
2086 AMDGPU_CG_SUPPORT_VCE_MGCG | 2089 AMD_CG_SUPPORT_VCE_MGCG |
2087 AMDGPU_CG_SUPPORT_UVD_MGCG | 2090 AMD_CG_SUPPORT_UVD_MGCG |
2088 AMDGPU_CG_SUPPORT_HDP_LS | 2091 AMD_CG_SUPPORT_HDP_LS |
2089 AMDGPU_CG_SUPPORT_HDP_MGCG; 2092 AMD_CG_SUPPORT_HDP_MGCG;
2090 adev->pg_flags = 2093 adev->pg_flags =
2091 /*AMDGPU_PG_SUPPORT_GFX_PG | 2094 /*AMD_PG_SUPPORT_GFX_PG |
2092 AMDGPU_PG_SUPPORT_GFX_SMG | 2095 AMD_PG_SUPPORT_GFX_SMG |
2093 AMDGPU_PG_SUPPORT_GFX_DMG |*/ 2096 AMD_PG_SUPPORT_GFX_DMG |*/
2094 AMDGPU_PG_SUPPORT_UVD | 2097 AMD_PG_SUPPORT_UVD |
2095 /*AMDGPU_PG_SUPPORT_VCE | 2098 /*AMD_PG_SUPPORT_VCE |
2096 AMDGPU_PG_SUPPORT_CP | 2099 AMD_PG_SUPPORT_CP |
2097 AMDGPU_PG_SUPPORT_GDS | 2100 AMD_PG_SUPPORT_GDS |
2098 AMDGPU_PG_SUPPORT_RLC_SMU_HS | 2101 AMD_PG_SUPPORT_RLC_SMU_HS |
2099 AMDGPU_PG_SUPPORT_ACP | 2102 AMD_PG_SUPPORT_ACP |
2100 AMDGPU_PG_SUPPORT_SAMU |*/ 2103 AMD_PG_SUPPORT_SAMU |*/
2101 0; 2104 0;
2102 if (adev->pdev->device == 0x1312 || 2105 if (adev->pdev->device == 0x1312 ||
2103 adev->pdev->device == 0x1316 || 2106 adev->pdev->device == 0x1316 ||
@@ -2109,29 +2112,29 @@ static int cik_common_early_init(void *handle)
2109 case CHIP_KABINI: 2112 case CHIP_KABINI:
2110 case CHIP_MULLINS: 2113 case CHIP_MULLINS:
2111 adev->cg_flags = 2114 adev->cg_flags =
2112 AMDGPU_CG_SUPPORT_GFX_MGCG | 2115 AMD_CG_SUPPORT_GFX_MGCG |
2113 AMDGPU_CG_SUPPORT_GFX_MGLS | 2116 AMD_CG_SUPPORT_GFX_MGLS |
2114 /*AMDGPU_CG_SUPPORT_GFX_CGCG |*/ 2117 /*AMD_CG_SUPPORT_GFX_CGCG |*/
2115 AMDGPU_CG_SUPPORT_GFX_CGLS | 2118 AMD_CG_SUPPORT_GFX_CGLS |
2116 AMDGPU_CG_SUPPORT_GFX_CGTS | 2119 AMD_CG_SUPPORT_GFX_CGTS |
2117 AMDGPU_CG_SUPPORT_GFX_CGTS_LS | 2120 AMD_CG_SUPPORT_GFX_CGTS_LS |
2118 AMDGPU_CG_SUPPORT_GFX_CP_LS | 2121 AMD_CG_SUPPORT_GFX_CP_LS |
2119 AMDGPU_CG_SUPPORT_SDMA_MGCG | 2122 AMD_CG_SUPPORT_SDMA_MGCG |
2120 AMDGPU_CG_SUPPORT_SDMA_LS | 2123 AMD_CG_SUPPORT_SDMA_LS |
2121 AMDGPU_CG_SUPPORT_BIF_LS | 2124 AMD_CG_SUPPORT_BIF_LS |
2122 AMDGPU_CG_SUPPORT_VCE_MGCG | 2125 AMD_CG_SUPPORT_VCE_MGCG |
2123 AMDGPU_CG_SUPPORT_UVD_MGCG | 2126 AMD_CG_SUPPORT_UVD_MGCG |
2124 AMDGPU_CG_SUPPORT_HDP_LS | 2127 AMD_CG_SUPPORT_HDP_LS |
2125 AMDGPU_CG_SUPPORT_HDP_MGCG; 2128 AMD_CG_SUPPORT_HDP_MGCG;
2126 adev->pg_flags = 2129 adev->pg_flags =
2127 /*AMDGPU_PG_SUPPORT_GFX_PG | 2130 /*AMD_PG_SUPPORT_GFX_PG |
2128 AMDGPU_PG_SUPPORT_GFX_SMG | */ 2131 AMD_PG_SUPPORT_GFX_SMG | */
2129 AMDGPU_PG_SUPPORT_UVD | 2132 AMD_PG_SUPPORT_UVD |
2130 /*AMDGPU_PG_SUPPORT_VCE | 2133 /*AMD_PG_SUPPORT_VCE |
2131 AMDGPU_PG_SUPPORT_CP | 2134 AMD_PG_SUPPORT_CP |
2132 AMDGPU_PG_SUPPORT_GDS | 2135 AMD_PG_SUPPORT_GDS |
2133 AMDGPU_PG_SUPPORT_RLC_SMU_HS | 2136 AMD_PG_SUPPORT_RLC_SMU_HS |
2134 AMDGPU_PG_SUPPORT_SAMU |*/ 2137 AMD_PG_SUPPORT_SAMU |*/
2135 0; 2138 0;
2136 if (adev->asic_type == CHIP_KABINI) { 2139 if (adev->asic_type == CHIP_KABINI) {
2137 if (adev->rev_id == 0) 2140 if (adev->rev_id == 0)
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-30 18:43:38 -0500