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

Commit e7f78b69 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/radeon: Add module param to control CIK support 



If AMDGPU supports CIK, add a module parameter to control CIK
support in radeon. It's off by default in radeon, while it will be
on by default in AMDGPU.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9c2e1ae3

drivers/gpu/drm/radeon/radeon.h

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ extern int radeon_mst; 
extern int radeon_uvd;

extern int radeon_vce;



#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

 * symbol;

drivers/gpu/drm/radeon/radeon_drv.c

+6 −0
Original line number Diff line number Diff line
@@ -295,6 +295,12 @@ 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_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

+18 −0
Original line number Diff line number Diff line
@@ -98,6 +98,24 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	struct radeon_device *rdev;

	int r, acpi_status;



#ifdef CONFIG_DRM_AMDGPU_CIK

	if (!radeon_cik_support) {

		switch (flags & RADEON_FAMILY_MASK) {

		case CHIP_KAVERI:

		case CHIP_BONAIRE:

		case CHIP_HAWAII:

		case CHIP_KABINI:

		case CHIP_MULLINS:

			dev_info(dev->dev,

				 "CIK support provided by amdgpu.\n");

			dev_info(dev->dev,

		"Use radeon.cik_support=1 amdgpu.cik_support=0 to override.\n"

				);

			return -ENODEV;

		}

	}

#endif



	rdev = kzalloc(sizeof(struct radeon_device), GFP_KERNEL);

	if (rdev == NULL) {

		return -ENOMEM;