Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac07e1b authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
parent ef789173

drivers/gpu/drm/radeon/radeon.h

+0 −5
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/radeon/radeon_drv.c

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/radeon/radeon_kms.c

+0 −4
Original line number Diff line number Diff line
@@ -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) {