Am 18.05.2017 um 23:44 schrieb Felix Kuehling:
> 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: Felix Kuehling <Felix.Kuehling at amd.com>
I'm not 100% sure if amdgpu should be the default for CIK either, but
let's give that a try for now.
Patches are Reviewed-by: Christian König <christian.koenig at amd.com>.
> ---
> drivers/gpu/drm/radeon/radeon.h | 4 ++++
> drivers/gpu/drm/radeon/radeon_drv.c | 6 ++++++
> drivers/gpu/drm/radeon/radeon_kms.c | 18 ++++++++++++++++++
> 3 files changed, 28 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index 7e9d3b9..8d2a021 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -116,6 +116,10 @@
> 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;
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index 2e5d680..2cdb01b 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -301,6 +301,12 @@ static inline void radeon_unregister_atpx_handler(void) {}
> 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
> };
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index 4388dde..9453e28 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -99,6 +99,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;
