diff options
author | Ken Wang <Qingqing.Wang@amd.com> | 2016-01-21 04:29:41 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-31 12:11:21 -0400 |
commit | 33f34802686c8bcfd236e085208ea6338d220251 (patch) | |
tree | c6a646d2a3c984893fbc9f511976d6b0738ff69c /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | a036db18c61d9a8ae6619cbb3dca8b1f2df68103 (diff) |
drm/amdgpu: add si ip blocks setup v3
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Ken Wang <Qingqing.Wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 27bfee2c7cc5..abea6f23c184 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -41,6 +41,9 @@ | |||
41 | #include "atom.h" | 41 | #include "atom.h" |
42 | #include "amdgpu_atombios.h" | 42 | #include "amdgpu_atombios.h" |
43 | #include "amd_pcie.h" | 43 | #include "amd_pcie.h" |
44 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
45 | #include "si.h" | ||
46 | #endif | ||
44 | #ifdef CONFIG_DRM_AMDGPU_CIK | 47 | #ifdef CONFIG_DRM_AMDGPU_CIK |
45 | #include "cik.h" | 48 | #include "cik.h" |
46 | #endif | 49 | #endif |
@@ -1231,6 +1234,17 @@ static int amdgpu_early_init(struct amdgpu_device *adev) | |||
1231 | if (r) | 1234 | if (r) |
1232 | return r; | 1235 | return r; |
1233 | break; | 1236 | break; |
1237 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
1238 | case CHIP_VERDE: | ||
1239 | case CHIP_TAHITI: | ||
1240 | case CHIP_PITCAIRN: | ||
1241 | case CHIP_OLAND: | ||
1242 | case CHIP_HAINAN: | ||
1243 | r = si_set_ip_blocks(adev); | ||
1244 | if (r) | ||
1245 | return r; | ||
1246 | break; | ||
1247 | #endif | ||
1234 | #ifdef CONFIG_DRM_AMDGPU_CIK | 1248 | #ifdef CONFIG_DRM_AMDGPU_CIK |
1235 | case CHIP_BONAIRE: | 1249 | case CHIP_BONAIRE: |
1236 | case CHIP_HAWAII: | 1250 | case CHIP_HAWAII: |