diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2016-09-29 23:36:12 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-10-25 14:38:03 -0400 |
| commit | a1d37046d4ff26c563fa509c28287278bc5ec80c (patch) | |
| tree | c89e3418cfb6cecfc90bab43fb4010485fb4533f /drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |
| parent | 1d160f430301d033053fc3a5237324d17552390b (diff) | |
drm/amdgpu/virtual_dce: add dce6 support
disable the real dce hw if the asic supports dce.
Reviewed-By: Emily Deng <Emily.Deng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_virtual.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index c2bd9f045532..4da46bed971a 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c | |||
| @@ -27,6 +27,9 @@ | |||
| 27 | #include "atom.h" | 27 | #include "atom.h" |
| 28 | #include "amdgpu_pll.h" | 28 | #include "amdgpu_pll.h" |
| 29 | #include "amdgpu_connectors.h" | 29 | #include "amdgpu_connectors.h" |
| 30 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
| 31 | #include "dce_v6_0.h" | ||
| 32 | #endif | ||
| 30 | #ifdef CONFIG_DRM_AMDGPU_CIK | 33 | #ifdef CONFIG_DRM_AMDGPU_CIK |
| 31 | #include "dce_v8_0.h" | 34 | #include "dce_v8_0.h" |
| 32 | #endif | 35 | #endif |
| @@ -99,6 +102,14 @@ static void dce_virtual_stop_mc_access(struct amdgpu_device *adev, | |||
| 99 | struct amdgpu_mode_mc_save *save) | 102 | struct amdgpu_mode_mc_save *save) |
| 100 | { | 103 | { |
| 101 | switch (adev->asic_type) { | 104 | switch (adev->asic_type) { |
| 105 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
| 106 | case CHIP_TAHITI: | ||
| 107 | case CHIP_PITCAIRN: | ||
| 108 | case CHIP_VERDE: | ||
| 109 | case CHIP_OLAND: | ||
| 110 | dce_v6_0_disable_dce(adev); | ||
| 111 | break; | ||
| 112 | #endif | ||
| 102 | #ifdef CONFIG_DRM_AMDGPU_CIK | 113 | #ifdef CONFIG_DRM_AMDGPU_CIK |
| 103 | case CHIP_BONAIRE: | 114 | case CHIP_BONAIRE: |
| 104 | case CHIP_HAWAII: | 115 | case CHIP_HAWAII: |
| @@ -119,6 +130,9 @@ static void dce_virtual_stop_mc_access(struct amdgpu_device *adev, | |||
| 119 | dce_v11_0_disable_dce(adev); | 130 | dce_v11_0_disable_dce(adev); |
| 120 | break; | 131 | break; |
| 121 | case CHIP_TOPAZ: | 132 | case CHIP_TOPAZ: |
| 133 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
| 134 | case CHIP_HAINAN: | ||
| 135 | #endif | ||
| 122 | /* no DCE */ | 136 | /* no DCE */ |
| 123 | return; | 137 | return; |
| 124 | default: | 138 | default: |
