diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-05-29 10:32:38 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-06-08 16:54:36 +0200 |
| commit | 6ac07e1b309a70469d2822689b54d4726846dd64 (patch) | |
| tree | b73efcaa6b28e98542f625002a7a578cd807eead /drivers/gpu/drm/radeon | |
| parent | drm/amdgpu: Update Kconfig help for SI and CIK support (diff) | |
| download | linux-6ac07e1b309a70469d2822689b54d4726846dd64.tar.xz linux-6ac07e1b309a70469d2822689b54d4726846dd64.zip | |
drm/radeon: Make si_support and cik_support parameters always available
This will allow amdgpu-pro / other out-of-tree amdgpu builds to make use
of these options for using the out-of-tree amdgpu driver instead of the
in-tree radeon driver in a clean way.
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index b9be8b30d89f..89ea0d99cdc0 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -115,13 +115,8 @@ extern int radeon_auxch; extern int radeon_mst; extern int radeon_uvd; extern int radeon_vce; - -#ifdef CONFIG_DRM_AMDGPU_SI extern int radeon_si_support; -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK extern int radeon_cik_support; -#endif /* * Copy from radeon_drv.h so we don't have to include both and have conflicting diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 02df5135b4de..cb6322d6a78f 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -295,17 +295,13 @@ module_param_named(uvd, radeon_uvd, int, 0444); MODULE_PARM_DESC(vce, "vce enable/disable vce support (1 = enable, 0 = disable)"); module_param_named(vce, radeon_vce, int, 0444); -#ifdef CONFIG_DRM_AMDGPU_SI int radeon_si_support = 1; MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)"); module_param_named(si_support, radeon_si_support, int, 0444); -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK int radeon_cik_support = 0; MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))"); module_param_named(cik_support, radeon_cik_support, int, 0444); -#endif static struct pci_device_id pciidlist[] = { radeon_PCI_IDS diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index dcb31633a726..7234fc74d39c 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -98,7 +98,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) struct radeon_device *rdev; int r, acpi_status; -#ifdef CONFIG_DRM_AMDGPU_SI if (!radeon_si_support) { switch (flags & RADEON_FAMILY_MASK) { case CHIP_TAHITI: @@ -111,8 +110,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) return -ENODEV; } } -#endif -#ifdef CONFIG_DRM_AMDGPU_CIK if (!radeon_cik_support) { switch (flags & RADEON_FAMILY_MASK) { case CHIP_KAVERI: @@ -128,7 +125,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) return -ENODEV; } } -#endif rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL); if (rdev == NULL) { |