> -----Original Message----- > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > Of Michel Dänzer > Sent: Monday, May 29, 2017 5:20 AM > To: amd-gfx at lists.freedesktop.org > Subject: [PATCH 3/3] drm/amdgpu/radeon: Use radeon by default for CIK > GPUs > > From: Michel Dänzer <michel.daenzer at amd.com> > > Even if CONFIG_DRM_AMDGPU_CIK is enabled. > > There is no feature parity yet for CIK, in particular amdgpu doesn't > support HDMI/DisplayPort without DC. "HDMI/DisplayPort audio" With that fixed, the series is: Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > > Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/Kconfig | 8 ++++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 7 +++++-- > drivers/gpu/drm/radeon/radeon_drv.c | 4 ++-- > drivers/gpu/drm/radeon/radeon_kms.c | 5 +---- > 5 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig > b/drivers/gpu/drm/amd/amdgpu/Kconfig > index 8d36087fc186..e0121f8b436e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/Kconfig > +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig > @@ -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 SI 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" > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 76dea5fe620b..27599db7d630 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -240,8 +240,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 > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index f4f77b99afeb..31901d2886d9 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -98,7 +98,7 @@ int amdgpu_driver_load_kms(struct drm_device *dev, > unsigned long flags) > dev_info(dev->dev, > "SI support provided by radeon.\n"); > dev_info(dev->dev, > - "Use radeon.si_support=0 amdgpu.si_support=1 to > override.\n" > + "Use radeon.si_support=0 > amdgpu.si_support=1 to override.\n" > ); > return -ENODEV; > } > @@ -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; > } > } > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c > b/drivers/gpu/drm/radeon/radeon_drv.c > index 1cefadfe4a41..853ef118a735 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -307,8 +307,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[] = { > diff --git a/drivers/gpu/drm/radeon/radeon_kms.c > b/drivers/gpu/drm/radeon/radeon_kms.c > index baaddf989f6d..8f2579772c34 100644 > --- a/drivers/gpu/drm/radeon/radeon_kms.c > +++ b/drivers/gpu/drm/radeon/radeon_kms.c > @@ -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; > } > } > -- > 2.11.0 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
