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

Commit 2b059658 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu/radeon: Use radeon by default for CIK GPUs 



Even if CONFIG_DRM_AMDGPU_CIK is enabled.

There is no feature parity yet for CIK, in particular amdgpu doesn't
support HDMI/DisplayPort audio without DC.

v2:
* Clarify the lack of feature parity being related to HDMI/DP audio.
* Fix "SI" typo in DRM_AMDGPU_CIK help entry.

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 6ac07e1b

drivers/gpu/drm/amd/amdgpu/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ config DRM_AMDGPU_CIK 
	help

	  Choose this option if you want to enable support for CIK asics.



	  CIK is already supported in radeon. If you enable this option,

	  support for CIK will be provided by amdgpu and disabled in

	  radeon by default. Use module options to override this:

	  CIK is already supported in radeon. Support for CIK in amdgpu

	  will be disabled by default and is still provided by radeon.

	  Use module options to override this:



	  radeon.cik_support=1 amdgpu.cik_support=0

	  radeon.cik_support=0 amdgpu.cik_support=1



config DRM_AMDGPU_USERPTR

	bool "Always enable userptr write support"

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

+2 −2
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ module_param_named(si_support, amdgpu_si_support, int, 0444); 
#endif



#ifdef CONFIG_DRM_AMDGPU_CIK

int amdgpu_cik_support = 1;

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

int amdgpu_cik_support = 0;

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

module_param_named(cik_support, amdgpu_cik_support, int, 0444);

#endif

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

+5 −2
Original line number Diff line number Diff line
@@ -113,7 +113,10 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) 
		case CHIP_KABINI:

		case CHIP_MULLINS:

			dev_info(dev->dev,

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

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

			dev_info(dev->dev,

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

				);

			return -ENODEV;

		}

	}

drivers/gpu/drm/radeon/radeon_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ 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);



int radeon_cik_support = 0;

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

int radeon_cik_support = 1;

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

module_param_named(cik_support, radeon_cik_support, int, 0444);



static struct pci_device_id pciidlist[] = {

drivers/gpu/drm/radeon/radeon_kms.c

+1 −4
Original line number Diff line number Diff line
@@ -118,10 +118,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) 
		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"

				);

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

			return -ENODEV;

		}

	}