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

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

drm/amdgpu: Add module param to control CIK support 



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

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>
parent b9683c21

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ extern int amdgpu_param_buf_per_se; 
extern int amdgpu_job_hang_limit;

extern int amdgpu_lbpw;



#ifdef CONFIG_DRM_AMDGPU_CIK

extern int amdgpu_cik_support;

#endif



#define AMDGPU_DEFAULT_GTT_SIZE_MB		3072ULL /* 3GB by default */

#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS	        3000

#define AMDGPU_MAX_USEC_TIMEOUT			100000	/* 100 ms */

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -242,6 +242,13 @@ module_param_named(job_hang_limit, amdgpu_job_hang_limit, int ,0444); 
MODULE_PARM_DESC(lbpw, "Load Balancing Per Watt (LBPW) support (1 = enable, 0 = disable, -1 = auto)");

module_param_named(lbpw, amdgpu_lbpw, int, 0444);



#ifdef CONFIG_DRM_AMDGPU_CIK

int amdgpu_cik_support = 1;

MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)");

module_param_named(cik_support, amdgpu_cik_support, int, 0444);

#endif





static const struct pci_device_id pciidlist[] = {

#ifdef  CONFIG_DRM_AMDGPU_SI

	{0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+15 −0
Original line number Diff line number Diff line
@@ -87,6 +87,21 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	struct amdgpu_device *adev;

	int r, acpi_status;



#ifdef CONFIG_DRM_AMDGPU_CIK

	if (!amdgpu_cik_support) {

		switch (flags & AMD_ASIC_MASK) {

		case CHIP_KAVERI:

		case CHIP_BONAIRE:

		case CHIP_HAWAII:

		case CHIP_KABINI:

		case CHIP_MULLINS:

			dev_info(dev->dev,

				 "CIK support disabled by module param\n");

			return -ENODEV;

		}

	}

#endif



	adev = kzalloc(sizeof(struct amdgpu_device), GFP_KERNEL);

	if (adev == NULL) {

		return -ENOMEM;