mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
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>
This commit is contained in:
parent
ef789173cb
commit
6ac07e1b30
3 changed files with 0 additions and 13 deletions
|
@ -115,13 +115,8 @@ extern int radeon_auxch;
|
||||||
extern int radeon_mst;
|
extern int radeon_mst;
|
||||||
extern int radeon_uvd;
|
extern int radeon_uvd;
|
||||||
extern int radeon_vce;
|
extern int radeon_vce;
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
|
||||||
extern int radeon_si_support;
|
extern int radeon_si_support;
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
|
||||||
extern int radeon_cik_support;
|
extern int radeon_cik_support;
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copy from radeon_drv.h so we don't have to include both and have conflicting
|
* Copy from radeon_drv.h so we don't have to include both and have conflicting
|
||||||
|
|
|
@ -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_PARM_DESC(vce, "vce enable/disable vce support (1 = enable, 0 = disable)");
|
||||||
module_param_named(vce, radeon_vce, int, 0444);
|
module_param_named(vce, radeon_vce, int, 0444);
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
|
||||||
int radeon_si_support = 1;
|
int radeon_si_support = 1;
|
||||||
MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
|
MODULE_PARM_DESC(si_support, "SI support (1 = enabled (default), 0 = disabled)");
|
||||||
module_param_named(si_support, radeon_si_support, int, 0444);
|
module_param_named(si_support, radeon_si_support, int, 0444);
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
|
||||||
int radeon_cik_support = 0;
|
int radeon_cik_support = 0;
|
||||||
MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
|
MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled, 0 = disabled (default))");
|
||||||
module_param_named(cik_support, radeon_cik_support, int, 0444);
|
module_param_named(cik_support, radeon_cik_support, int, 0444);
|
||||||
#endif
|
|
||||||
|
|
||||||
static struct pci_device_id pciidlist[] = {
|
static struct pci_device_id pciidlist[] = {
|
||||||
radeon_PCI_IDS
|
radeon_PCI_IDS
|
||||||
|
|
|
@ -98,7 +98,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
|
||||||
struct radeon_device *rdev;
|
struct radeon_device *rdev;
|
||||||
int r, acpi_status;
|
int r, acpi_status;
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_SI
|
|
||||||
if (!radeon_si_support) {
|
if (!radeon_si_support) {
|
||||||
switch (flags & RADEON_FAMILY_MASK) {
|
switch (flags & RADEON_FAMILY_MASK) {
|
||||||
case CHIP_TAHITI:
|
case CHIP_TAHITI:
|
||||||
|
@ -111,8 +110,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_DRM_AMDGPU_CIK
|
|
||||||
if (!radeon_cik_support) {
|
if (!radeon_cik_support) {
|
||||||
switch (flags & RADEON_FAMILY_MASK) {
|
switch (flags & RADEON_FAMILY_MASK) {
|
||||||
case CHIP_KAVERI:
|
case CHIP_KAVERI:
|
||||||
|
@ -128,7 +125,6 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL);
|
rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL);
|
||||||
if (rdev == NULL) {
|
if (rdev == NULL) {
|
||||||
|
|
Loading…
Reference in a new issue