diff options
author | Felix Kuehling <Felix.Kuehling@amd.com> | 2017-06-05 05:53:55 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-06-08 10:54:34 -0400 |
commit | 6dd13096830f5f6589bcfb4d35880590775942ca (patch) | |
tree | 412b1f16f67f9a1ffe83586d3457c7243d34224f /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |
parent | 36ffce0ac0424ad886061f59b2fabbc4133af37f (diff) |
drm/amdgpu: Add module param to control SI support
If AMDGPU supports SI, add a module parameter to control SI
support. It's off by default in AMDGPU as long as SI suppost is
experimental, while it is on by default in radeon.
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
[ Michel Dänzer: Squash in amdgpu_si_support initialization fix ]
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index e0911798e2c2..bd35c83c7c78 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | |||
@@ -87,6 +87,23 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) | |||
87 | struct amdgpu_device *adev; | 87 | struct amdgpu_device *adev; |
88 | int r, acpi_status; | 88 | int r, acpi_status; |
89 | 89 | ||
90 | #ifdef CONFIG_DRM_AMDGPU_SI | ||
91 | if (!amdgpu_si_support) { | ||
92 | switch (flags & AMD_ASIC_MASK) { | ||
93 | case CHIP_TAHITI: | ||
94 | case CHIP_PITCAIRN: | ||
95 | case CHIP_VERDE: | ||
96 | case CHIP_OLAND: | ||
97 | case CHIP_HAINAN: | ||
98 | dev_info(dev->dev, | ||
99 | "SI support provided by radeon.\n"); | ||
100 | dev_info(dev->dev, | ||
101 | "Use radeon.si_support=0 amdgpu.si_support=1 to override.\n" | ||
102 | ); | ||
103 | return -ENODEV; | ||
104 | } | ||
105 | } | ||
106 | #endif | ||
90 | #ifdef CONFIG_DRM_AMDGPU_CIK | 107 | #ifdef CONFIG_DRM_AMDGPU_CIK |
91 | if (!amdgpu_cik_support) { | 108 | if (!amdgpu_cik_support) { |
92 | switch (flags & AMD_ASIC_MASK) { | 109 | switch (flags & AMD_ASIC_MASK) { |