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: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index 8d36087fc186429d87f306437f773b43f5a3a151..26682454a4463dd36b3c1ffdbd66bdb666c04488 100644 (file)
--- 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 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"

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 103d41a7ae957a4079f729f5ec502525d4438e1c..428363ff8c199acacc374d0a8265541072bbe69b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -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
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index bd35c83c7c787b9e31af66ccace313601346614b..92e93b34118cfcc7e1b76959787612dc810520e7 100644 (file)
--- 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 cb6322d6a78f76265e8ef9d4b311acff54d3853d..af27d6acc2494ee339563e56b70bca735f95abda 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -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[] = {

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 7234fc74d39c7a9a794e7e22de5adb6d8c3d3428..5abc53e1f705ea0a95ed49e5302c341e1d0cb79a 100644 (file)
--- 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;
                }
        }