Skip to contentSkip to conversation

drm/radeon: Make CIK support in Radeon conditional (v2)

PATCH In review Felix Kuehling 8 participants 18 messages Apr 7, 2017 – Apr 13, 2017 12 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/radeon: Make CIK support in Radeon conditional (v2)

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

---
 drivers/gpu/drm/radeon/Kconfig      |  12 ++++
 drivers/gpu/drm/radeon/radeon_drv.c |   3 +
 include/drm/drm_pciids.h            | 114 ++++++++++++++++++------------------
 3 files changed, 73 insertions(+), 56 deletions(-)
drivers/gpu/drm/radeon/Kconfig +12 -0
index 9909f5c..86bbac8 100644
@@ -1,3 +1,15 @@
+config DRM_RADEON_FORCE_CIK
+	bool "Enable radeon support for CIK parts even when amdgpu supports it"
+	depends on DRM_RADEON && DRM_AMDGPU_CIK
+	default n
+	help
+	  Choose this option if you want to enable support for CIK ASICs
+	  in the radeon driver even when CONFIG_DRM_AMDGPU_CIK is enabled.
+
+	  This option is meant for experimentation and testing. In a
+	  production system only one driver should claim support for the
+	  same ASIC.
+
 config DRM_RADEON_USERPTR
 	bool "Always enable userptr support"
 	depends on DRM_RADEON
drivers/gpu/drm/radeon/radeon_drv.c +3 -0
index 2e5d680..fda6411 100644
@@ -302,6 +302,9 @@ static inline void radeon_unregister_atpx_handler(void) {}
 module_param_named(vce, radeon_vce, int, 0444);
 
 static struct pci_device_id pciidlist[] = {
+#if !defined(CONFIG_DRM_AMDGPU_CIK) || defined(CONFIG_DRM_RADEON_FORCE_CIK)
+	radeon_CIK_PCI_IDS,
+#endif
 	radeon_PCI_IDS
 };
 
include/drm/drm_pciids.h +58 -56

141 lines not on this page · raw message

Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1491596149-3709-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/3 drm/radeon: Make SI support in Radeon conditional

Advertise SI PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_SI to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more SI-specific code in the Radeon driver.

---
 drivers/gpu/drm/radeon/Kconfig      |  12 +++
 drivers/gpu/drm/radeon/radeon_drv.c |   3 +
 include/drm/drm_pciids.h            | 146 ++++++++++++++++++------------------
 3 files changed, 89 insertions(+), 72 deletions(-)
drivers/gpu/drm/radeon/Kconfig +12 -0
index 86bbac8..2e66198 100644
@@ -1,3 +1,15 @@
+config DRM_RADEON_FORCE_SI
+	bool "Enable radeon support for SI parts even when amdgpu supports it"
+	depends on DRM_RADEON && DRM_AMDGPU_SI
+	default n
+	help
+	  Choose this option if you want to enable support for SI ASICs
+	  in the radeon driver even when CONFIG_DRM_AMDGPU_SI is enabled.
+
+	  This option is meant for experimentation and testing. In a
+	  production system only one driver should claim support for the
+	  same ASIC.
+
 config DRM_RADEON_FORCE_CIK
 	bool "Enable radeon support for CIK parts even when amdgpu supports it"
 	depends on DRM_RADEON && DRM_AMDGPU_CIK
drivers/gpu/drm/radeon/radeon_drv.c +3 -0
index fda6411..235c324 100644
@@ -305,6 +305,9 @@ static inline void radeon_unregister_atpx_handler(void) {}
 #if !defined(CONFIG_DRM_AMDGPU_CIK) || defined(CONFIG_DRM_RADEON_FORCE_CIK)
 	radeon_CIK_PCI_IDS,
 #endif
+#if !defined(CONFIG_DRM_AMDGPU_SI) || defined(CONFIG_DRM_RADEON_FORCE_SI)
+	radeon_CIK_PCI_IDS,
+#endif
 	radeon_PCI_IDS
 };
 
include/drm/drm_pciids.h +74 -72

161 lines not on this page · raw message

Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1491596149-3709-2-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org

#4 lore raw

RE: [PATCH 2/3] drm/radeon: Make SI support in Radeon conditional

My understanding is that SI support in AMDGPU is limited.
So maybe here it can be the other way around, that by default SI support in AMDGPU shall be disabled.

Sam

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Felix Kuehling
Sent: Friday, April 07, 2017 4:16 PM
To: [email protected]
Cc: Kuehling, Felix <[email protected]>
Subject: [PATCH 2/3] drm/radeon: Make SI support in Radeon conditional

Advertise SI PCI IDs only when they are not supported by amdgpu.
Use the CONFIG_DRM_AMDGPU_SI to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more SI-specific code in the Radeon driver.

---
 drivers/gpu/drm/radeon/Kconfig      |  12 +++
 drivers/gpu/drm/radeon/radeon_drv.c |   3 +
 include/drm/drm_pciids.h            | 146 ++++++++++++++++++------------------
 3 files changed, 89 insertions(+), 72 deletions(-)
drivers/gpu/drm/radeon/Kconfig +12 -0
@@ -1,3 +1,15 @@
+config DRM_RADEON_FORCE_SI
+	bool "Enable radeon support for SI parts even when amdgpu supports it"
+	depends on DRM_RADEON && DRM_AMDGPU_SI
+	default n
+	help
+	  Choose this option if you want to enable support for SI ASICs
+	  in the radeon driver even when CONFIG_DRM_AMDGPU_SI is enabled.
+
+	  This option is meant for experimentation and testing. In a
+	  production system only one driver should claim support for the
+	  same ASIC.
+
 config DRM_RADEON_FORCE_CIK
 	bool "Enable radeon support for CIK parts even when amdgpu supports it"
 	depends on DRM_RADEON && DRM_AMDGPU_CIK diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c

index fda6411..235c324 100644

drivers/gpu/drm/radeon/radeon_drv.c +3 -0
@@ -305,6 +305,9 @@ static inline void radeon_unregister_atpx_handler(void) {}  #if !defined(CONFIG_DRM_AMDGPU_CIK) || defined(CONFIG_DRM_RADEON_FORCE_CIK)
 	radeon_CIK_PCI_IDS,
 #endif
+#if !defined(CONFIG_DRM_AMDGPU_SI) || defined(CONFIG_DRM_RADEON_FORCE_SI)
+	radeon_CIK_PCI_IDS,
+#endif
 	radeon_PCI_IDS
 };
 
include/drm/drm_pciids.h +75 -0

77 lines not on this page · raw message

{0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -217,29 +291,6 @@

 	{0x1002, 0x5e4c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5e4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x5e4f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6600, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6602, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6603, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6604, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6605, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6606, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6607, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6608, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6610, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6611, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6613, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6617, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6620, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6623, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6631, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6663, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6664, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6665, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6667, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x666F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAYMAN|RADEON_NEW_MEMMAP}, \ @@ -301,55 +352,6 @@
 	{0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x677B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6784, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x678A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6790, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6791, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6792, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x679B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x679E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x679F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6802, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6806, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6819, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6823, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6826, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x682A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x682C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x683B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x683D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x683F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6841, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
 	{0x1002, 0x6842, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \

--
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

PATCH 3/3 drm/amdgpu: CIK support is no longer experimental

In reply to a message not in the archive

Change the wording of the CONFIG_DRM_AMDGPU_CIK option to indicate that it's no longer experimental.

---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +5 -4
index f3b6df8..029e3fe 100644
@@ -9,11 +9,12 @@ config DRM_AMDGPU_CIK
 	bool "Enable amdgpu support for CIK parts"
 	depends on DRM_AMDGPU
 	help
-	  Choose this option if you want to enable experimental support
-	  for CIK asics.
+	  Choose this option if you want to enable support for CIK asics.
 
-	  CIK is already supported in radeon.  CIK support in amdgpu
-	  is for experimentation and testing.
+	  If you choose No here, CIK ASICs will be supported by the
+	  radeon driver, as in previous kernel versions. Depending on
+	  your choice you will need different user mode (Mesa, X.org)
+	  drivers to support accelerated graphics on CIK.
 
 config DRM_AMDGPU_USERPTR
 	bool "Always enable userptr write support"
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1491596149-3709-3-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org

#7 lore raw

Re: [PATCH 3/3] drm/amdgpu: CIK support is no longer experimental

Quoted 16 lines · Felix Kuehling

Change the wording of the CONFIG_DRM_AMDGPU_CIK option to indicate that it's no longer experimental.

---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +0 -0
index f3b6df8..029e3fe 100644
@@ -9,11 +9,12 @@ config DRM_AMDGPU_CIK
 	bool "Enable amdgpu support for CIK parts"
 	depends on DRM_AMDGPU
 	help

drivers/gpu/drm/amd/amdgpu/Kconfig config DRM_AMDGPU_CIK · line 17

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +5 -4
-	  Choose this option if you want to enable experimental support
-	  for CIK asics.
+	  Choose this option if you want to enable support for CIK asics.
 
-	  CIK is already supported in radeon.  CIK support in amdgpu
-	  is for experimentation and testing.
+	  If you choose No here, CIK ASICs will be supported by the
+	  radeon driver, as in previous kernel versions. Depending on
+	  your choice you will need different user mode (Mesa, X.org)
+	  drivers to support accelerated graphics on CIK.

The last part is a bit misleading: while you do need different DDXes, the same Mesa driver (radeonsi) will work with both the radeon and the amdgpu kernel module for CIK. FWIW, the same is true for SI, although older versions of Mesa might stumble when run on the amdgpu kernel module.

Cheers,
Nicolai

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +0 -0
 config DRM_AMDGPU_USERPTR
 	bool "Always enable userptr write support"
 
Signature · 6 lines
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): f1c88cc8-9c62-52eb-fb21-a5048f771c7e-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#9 lore raw

Re: [PATCH 3/3] drm/amdgpu: CIK support is no longer experimental

Quoted 22 lines · Nicolai Hähnle
Quoted 21 lines · Felix Kuehling

Change the wording of the CONFIG_DRM_AMDGPU_CIK option to indicate that it's no longer experimental.

---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +1 -2
index f3b6df8..029e3fe 100644
@@ -9,11 +9,12 @@ config DRM_AMDGPU_CIK
     bool "Enable amdgpu support for CIK parts"
     depends on DRM_AMDGPU
     help
-      Choose this option if you want to enable experimental support
-      for CIK asics.
+      Choose this option if you want to enable support for CIK asics.
 
Quoted 12 lines

drivers/gpu/drm/amd/amdgpu/Kconfig config DRM_AMDGPU_CIK · line 17

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +4 -2
-      CIK is already supported in radeon.  CIK support in amdgpu
-      is for experimentation and testing.
+      If you choose No here, CIK ASICs will be supported by the
+      radeon driver, as in previous kernel versions. Depending on
+      your choice you will need different user mode (Mesa, X.org)
+      drivers to support accelerated graphics on CIK.

The last part is a bit misleading: while you do need different DDXes, the same Mesa driver (radeonsi) will work with both the radeon and the amdgpu kernel module for CIK. FWIW, the same is true for SI, although older versions of Mesa might stumble when run on the amdgpu kernel module.

I see. Do you know the minimum Mesa version required for SI and CIK support on amdgpu respectively?

Thanks,
Felix

Quoted 11 lines

Cheers,
Nicolai

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +0 -0
 config DRM_AMDGPU_USERPTR
     bool "Always enable userptr write support"
 

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 5ba7f549-d3b3-e817-8673-cdfbe8539314-5C7GfCeVMHo@public.gmane.org

#11 lore raw

Re: [PATCH 3/3] drm/amdgpu: CIK support is no longer experimental

Quoted 36 lines · Felix Kuehling
Quoted 22 lines · Nicolai Hähnle
Quoted 21 lines · Felix Kuehling

Change the wording of the CONFIG_DRM_AMDGPU_CIK option to indicate that it's no longer experimental.

---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +1 -2
index f3b6df8..029e3fe 100644
@@ -9,11 +9,12 @@ config DRM_AMDGPU_CIK
     bool "Enable amdgpu support for CIK parts"
     depends on DRM_AMDGPU
     help
-      Choose this option if you want to enable experimental support
-      for CIK asics.
+      Choose this option if you want to enable support for CIK asics.
 
Quoted 12 lines

drivers/gpu/drm/amd/amdgpu/Kconfig config DRM_AMDGPU_CIK · line 17

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +4 -2
-      CIK is already supported in radeon.  CIK support in amdgpu
-      is for experimentation and testing.
+      If you choose No here, CIK ASICs will be supported by the
+      radeon driver, as in previous kernel versions. Depending on
+      your choice you will need different user mode (Mesa, X.org)
+      drivers to support accelerated graphics on CIK.

The last part is a bit misleading: while you do need different DDXes, the same Mesa driver (radeonsi) will work with both the radeon and the amdgpu kernel module for CIK. FWIW, the same is true for SI, although older versions of Mesa might stumble when run on the amdgpu kernel module.

Quoted 2 lines

I see. Do you know the minimum Mesa version required for SI and CIK support on amdgpu respectively?

For SI, it's Mesa 17.0.

For CIK, I kind of suspect the support has "always" been there, since the amdgpu kernel module was originally brought up on CIK, but maybe Marek knows more.

Cheers,
Nicolai

Quoted 16 lines

Thanks,
Felix

Quoted 11 lines

Cheers,
Nicolai

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +0 -0
 config DRM_AMDGPU_USERPTR
     bool "Always enable userptr write support"
 
Signature · 6 lines
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 30b88eb7-6b6b-fd52-fcb2-0fd11c9155f6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#13 lore raw

Re: [PATCH 3/3] drm/amdgpu: CIK support is no longer experimental

Quoted 46 lines · Nicolai Hähnle
Quoted 41 lines · Felix Kuehling
Quoted 24 lines · Nicolai Hähnle
Quoted 22 lines · Felix Kuehling

Change the wording of the CONFIG_DRM_AMDGPU_CIK option to indicate that it's no longer experimental.

---
 drivers/gpu/drm/amd/amdgpu/Kconfig | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/Kconfig +1 -2
index f3b6df8..029e3fe 100644
@@ -9,11 +9,12 @@ config DRM_AMDGPU_CIK
     bool "Enable amdgpu support for CIK parts"
     depends on DRM_AMDGPU
     help
-      Choose this option if you want to enable experimental support
-      for CIK asics.
+      Choose this option if you want to enable support for CIK asics.
 
Quoted 13 lines

drivers/gpu/drm/amd/amdgpu/Kconfig config DRM_AMDGPU_CIK · line 17

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/Kconfig +4 -2
-      CIK is already supported in radeon.  CIK support in amdgpu
-      is for experimentation and testing.
+      If you choose No here, CIK ASICs will be supported by the
+      radeon driver, as in previous kernel versions. Depending on
+      your choice you will need different user mode (Mesa, X.org)
+      drivers to support accelerated graphics on CIK.

The last part is a bit misleading: while you do need different DDXes, the same Mesa driver (radeonsi) will work with both the radeon and the amdgpu kernel module for CIK. FWIW, the same is true for SI, although older versions of Mesa might stumble when run on the amdgpu kernel module.

Quoted 2 lines

I see. Do you know the minimum Mesa version required for SI and CIK support on amdgpu respectively?

Quoted 5 lines

For SI, it's Mesa 17.0.

For CIK, I kind of suspect the support has "always" been there, since the amdgpu kernel module was originally brought up on CIK, but maybe Marek knows more.

Yes, CIK Mesa support should work with all amdgpu versions.

Marek
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by
#14 lore raw
In reply to a message not in the archive

Am 07.04.2017 um 22:15 schrieb Felix Kuehling:

Quoted 11 lines

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

Quoted 180 lines
---
  drivers/gpu/drm/radeon/Kconfig      |  12 ++++
  drivers/gpu/drm/radeon/radeon_drv.c |   3 +
  include/drm/drm_pciids.h            | 114 ++++++++++++++++++------------------
  3 files changed, 73 insertions(+), 56 deletions(-)
drivers/gpu/drm/radeon/Kconfig +12 -0
index 9909f5c..86bbac8 100644
@@ -1,3 +1,15 @@
+config DRM_RADEON_FORCE_CIK
+	bool "Enable radeon support for CIK parts even when amdgpu supports it"
+	depends on DRM_RADEON && DRM_AMDGPU_CIK
+	default n
+	help
+	  Choose this option if you want to enable support for CIK ASICs
+	  in the radeon driver even when CONFIG_DRM_AMDGPU_CIK is enabled.
+
+	  This option is meant for experimentation and testing. In a
+	  production system only one driver should claim support for the
+	  same ASIC.
+
  config DRM_RADEON_USERPTR
  	bool "Always enable userptr support"
  	depends on DRM_RADEON
drivers/gpu/drm/radeon/radeon_drv.c +3 -0
index 2e5d680..fda6411 100644
@@ -302,6 +302,9 @@ static inline void radeon_unregister_atpx_handler(void) {}
  module_param_named(vce, radeon_vce, int, 0444);
 
  static struct pci_device_id pciidlist[] = {
+#if !defined(CONFIG_DRM_AMDGPU_CIK) || defined(CONFIG_DRM_RADEON_FORCE_CIK)
+	radeon_CIK_PCI_IDS,
+#endif
  	radeon_PCI_IDS
  };
 
include/drm/drm_pciids.h +58 -49
index 8bc073d..cf17901 100644
@@ -1,4 +1,4 @@
-#define radeon_PCI_IDS \
+#define radeon_CIK_PCI_IDS \
  	{0x1002, 0x1304, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x1305, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x1306, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -21,6 +21,63 @@
  	{0x1002, 0x131B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x131C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x131D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KAVERI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x6658, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x665c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x665d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x665f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67A8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67A9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67AA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67B0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67B1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67B8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67B9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67BA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x67BE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
+	{0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
+	{0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}
+
+#define radeon_PCI_IDS \
  	{0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \
  	{0x1002, 0x3151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x3152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -177,17 +234,6 @@
  	{0x1002, 0x6621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6623, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6631, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_OLAND|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6640, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6641, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6650, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x6658, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x665c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x665d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x665f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_BONAIRE|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6663, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6664, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAINAN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -268,18 +314,6 @@
  	{0x1002, 0x679B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x679E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x679F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67A1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67A8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67A9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67AA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67B0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67B1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67B8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67B9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67BA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
-	{0x1002, 0x67BE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_HAWAII|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
  	{0x1002, 0x6802, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -629,38 +663,6 @@
  	{0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x980A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9832, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9833, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x983f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_KABINI|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9851, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9852, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9853, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9854, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9856, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9857, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x9858, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

include/drm/drm_pciids.h line 668

Quoted 10 lines
include/drm/drm_pciids.h +0 -7
-	{0x1002, 0x9859, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
-	{0x1002, 0x985F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_MULLINS|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
  	{0x1002, 0x9903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#15 lore raw
In reply to a message not in the archive
Quoted 22 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

---
 drivers/gpu/drm/radeon/Kconfig      |  12 ++++
 drivers/gpu/drm/radeon/radeon_drv.c |   3 +
 include/drm/drm_pciids.h            | 114 ++++++++++++++++++------------------
 3 files changed, 73 insertions(+), 56 deletions(-)
drivers/gpu/drm/radeon/Kconfig +0 -0
index 9909f5c..86bbac8 100644

drivers/gpu/drm/radeon/Kconfig line 3

Quoted 3 lines
drivers/gpu/drm/radeon/Kconfig +3 -0
@@ -1,3 +1,15 @@
+config DRM_RADEON_FORCE_CIK
+       bool "Enable radeon support for CIK parts even when amdgpu supports it"
+       depends on DRM_RADEON && DRM_AMDGPU_CIK

Something looks a bit wrong here, and the rest of the series.

As-is, RADEON CIK is disabled when AMDGPU/AMDGPU CIK is _not_ set. In other words - people who build only RADEON will end up with "broken" system.

Shouldn't the DRM_RADEON_FORCE_CIK DRM_AMDGPU_CIK options be mutually explosive ?
Such that only one driver can claim/use the hardware. Otherwise you will get both drivers fighting for control.

Thanks
Emil
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#16 lore raw
In reply to a message not in the archive
Quoted 11 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

I don't think this is good enough a solution.

I want to be able to choose the driver to use at runtime, for each GPU individually. To make that possible, we probably need some kind of kernel command line option which is respected by both radeon and amdgpu drivers, plus possibly additional per-driver module parameters which can override that kernel command line option.

CONFIG_DRM_AMDGPU_CIK/SI would then simply define which driver gets to drive CIK/SI GPUs by default.

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 56a29a84-7b92-a666-5d0b-b6c2f3395b21-otUistvHUpPR7s880joybQ@public.gmane.org

#18 lore raw
Quoted 9 lines · Michel Dänzer
Quoted 8 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

Quoted 5 lines
Quoted 3 lines

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

Quoted 2 lines

CONFIG_DRM_AMDGPU_CIK/SI would then simply define which driver gets to drive CIK/SI GPUs by default.

To avoid the above, I'd say this should be the first step: Make CONFIG_DRM_AMDGPU_CIK/SI define which driver will register for CIK/SI GPUs by default. This does require some way to override it at runtime, though. A simple initial solution for that might be "force_cik"/"force_si" module parameters in both drivers. Setting force_cik/si=1/0 would make the driver register for / not register for CIK/SI GPUs.

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 64d15f06-1560-825c-c186-2209f87908fc-otUistvHUpPR7s880joybQ@public.gmane.org

#20 lore raw
Quoted 12 lines · Michel Dänzer
Quoted 11 lines · Michel Dänzer
Quoted 10 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

Quoted 8 lines
Quoted 2 lines
Quoted 1 line

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

So what's the usage model here? I think the situation that both AMDGPU and Radeon support CIK is for developers only. "Normal end users" would never be in this situation.

For developers, Christian is OK with having just a compile time option, and probably choosing the driver by loading the right module manually. You want to have a boot time kernel option.

Are there any other ideas or requests, before I go spend more time on this?

Quoted 11 lines
Quoted 4 lines

CONFIG_DRM_AMDGPU_CIK/SI would then simply define which driver gets to drive CIK/SI GPUs by default.

To avoid the above, I'd say this should be the first step: Make CONFIG_DRM_AMDGPU_CIK/SI define which driver will register for CIK/SI GPUs by default. This does require some way to override it at runtime, though. A simple initial solution for that might be "force_cik"/"force_si" module parameters in both drivers. Setting force_cik/si=1/0 would make the driver register for / not register for CIK/SI GPUs.

Currently the options control the PCI ID aliases that are listed in the module description. This affects which module will be loaded by modprobe. If I make this a runtime option, I need some other mechanism to reject certain GPUs even though modprobe loaded the module (probably return failure from the driver->load() callback).

I'm also not sure whether modprobe would load both modules, or only one. If it loads only one, you may end up with no graphics until you manually insmod the other module.

Regards,
Felix
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 74d677b8-6b81-e137-af67-ec4834c72bcc-5C7GfCeVMHo@public.gmane.org

#22 lore raw
Quoted 26 lines · Felix Kuehling
Quoted 12 lines · Michel Dänzer
Quoted 11 lines · Michel Dänzer
Quoted 10 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

Quoted 8 lines
Quoted 2 lines
Quoted 1 line

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

So what's the usage model here? I think the situation that both AMDGPU and Radeon support CIK is for developers only. "Normal end users" would never be in this situation.

Quoted 5 lines

For developers, Christian is OK with having just a compile time option, and probably choosing the driver by loading the right module manually. You want to have a boot time kernel option.

Are there any other ideas or requests, before I go spend more time on this?

In the short term, it would probably be good to just have a tri-state option:
1. only radeon
2. only amdgpu
3. both

I don't think there is a good automagic option.

Alex
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): CADnq5_Pz-NymmWd6ExLNxRJ=UVygHsQcaua26ULZstZ409LZzw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#24 lore raw
Quoted 10 lines · Alex Deucher
Quoted 2 lines · Felix Kuehling

Are there any other ideas or requests, before I go spend more time on this?

In the short term, it would probably be good to just have a tri-state option:
1. only radeon
2. only amdgpu
3. both

I don't think there is a good automagic option.

As I understand it, tristate options are for Yes/No/Module choices.

Were you thinking of something like this?

choice DRM_CIK_SUPPORT
prompt "Support for AMD CIK ASICs"
depends on DRM_AMDGPU || DRM_RADEON

config DRM_CIK_RADEON
bool "Radeon"
depends on DRM_RADEON

config DRM_CIK_AMDGPU
bool "AMDGPU"
depends on DRM_AMDGPU

config DRM_CIK_BOTH_DEFAULT_RADEON
bool "Both, use Radeon by default"
depends on DRM_AMDGPU && DRM_RADEON

config DRM_CIK_BOTH_DEFAULT_AMDGPU
bool "Both, use AMDGPU by default"
depends on DRM_AMDGPU && DRM_RADEON

endchoice

Regards,
Felix

Quoted 2 lines

Alex

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#25 lore raw
In reply to a message not in the archive
Quoted 22 lines · Felix Kuehling
Quoted 12 lines · Michel Dänzer
Quoted 11 lines · Michel Dänzer
Quoted 10 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

Quoted 8 lines
Quoted 2 lines
Quoted 1 line

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

Quoted 3 lines

So what's the usage model here? I think the situation that both AMDGPU and Radeon support CIK is for developers only. "Normal end users" would never be in this situation.

I agree in the long term, but for now, there's still too many bugs which force users to use one or the other driver. Since this patch would require distros to choose one driver for all of their users, with no way to override at runtime, it would probably result in bad user experiences and/or a support nightmare at least in the short term.

Quoted 3 lines

For developers, Christian is OK with having just a compile time option, and probably choosing the driver by loading the right module manually. You want to have a boot time kernel option.

Note that I'm okay with an inconvenient mechanism for choosing the driver at runtime, as long as there is one. The important thing is to fix the current situation where it's essentially up to chance which driver ends up driving a GPU supported by both.

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 5aad3a06-180b-ff87-e9c9-c0399ddcf67b-otUistvHUpPR7s880joybQ@public.gmane.org

#27 lore raw
Quoted 22 lines · Michel Dänzer
Quoted 21 lines · Felix Kuehling
Quoted 20 lines · Michel Dänzer
Quoted 5 lines · Michel Dänzer
Quoted 4 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

Quoted 8 lines
Quoted 7 lines

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

Quoted 8 lines
Quoted 3 lines

So what's the usage model here? I think the situation that both AMDGPU and Radeon support CIK is for developers only. "Normal end users" would never be in this situation.

I agree in the long term, but for now, there's still too many bugs which force users to use one or the other driver. Since this patch would require distros to choose one driver for all of their users, with no way to override at runtime, it would probably result in bad user experiences and/or a support nightmare at least in the short term.

Right now the only sane configuration that a distro can choose is to support CIK with radeon and not build CIK support into amdgpu. That choice will still be available. So nothing changes for a risk-averse distribution.

If a distribution's choice does not work for all users, and end users have to change the preference at runtime, that's already a bad user experience. Just having the runtime option available doesn't make it a better user experience, because most user won't know that there is a choice and won't know that their issues can be fixed that way.

Regards,
Felix

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): bb600a20-2679-004f-15e9-9dd12ae305c1-5C7GfCeVMHo@public.gmane.org

#29 lore raw
Quoted 32 lines · Felix Kuehling
Quoted 22 lines · Michel Dänzer
Quoted 21 lines · Felix Kuehling
Quoted 20 lines · Michel Dänzer
Quoted 5 lines · Michel Dänzer
Quoted 4 lines · Felix Kuehling

Advertise CIK PCI IDs only when they are not supported by amdgpu. Use the CONFIG_DRM_AMDGPU_CIK to check so that a single option in the kernel config keeps both drivers in sync.

Quoted 8 lines
Quoted 7 lines

This is the simplest possible change. A more complete solution may want to conditionally disable more CIK-specific code in the Radeon driver.

v2: Add CONFIG_DRM_RADEON_FORCE_CIK option

I don't think this is good enough a solution.

To elaborate, my main objection is that people who still want to be able to use the radeon driver for CIK/SI GPUs with CONFIG_DRM_AMDGPU_CIK enabled have to enable the new CONFIG_DRM_RADEON_FORCE_CIK/SI option, and then they're merely back to square one, in the current situation where it's not clearly defined which driver will end up being used for such GPUs.

Quoted 8 lines
Quoted 3 lines

So what's the usage model here? I think the situation that both AMDGPU and Radeon support CIK is for developers only. "Normal end users" would never be in this situation.

I agree in the long term, but for now, there's still too many bugs which force users to use one or the other driver. Since this patch would require distros to choose one driver for all of their users, with no way to override at runtime, it would probably result in bad user experiences and/or a support nightmare at least in the short term.

Quoted 4 lines

Right now the only sane configuration that a distro can choose is to support CIK with radeon and not build CIK support into amdgpu. That choice will still be available. So nothing changes for a risk-averse distribution.

Right. That said, CIK support in amdgpu seems to be getting pretty solid overall (and it's a requirement for Vulkan), so (something like) your latest patch will allow distros to keep radeon as the default for now, but make it easy for adventurous users to try out amdgpu.

FWIW, some distros (at least openSuse AFAIK) are already enabling CONFIG_DRM_AMDGPU_CIK in their kernels, exposing their users to the gamble of which driver gets to drive their CIK GPUs. Thank you for getting the ball rolling on improving this situation!

Quoted 5 lines

If a distribution's choice does not work for all users, and end users have to change the preference at runtime, that's already a bad user experience. Just having the runtime option available doesn't make it a better user experience, because most user won't know that there is a choice and won't know that their issues can be fixed that way.

If nothing else, it'll allow us to give suggestions for easy workarounds in bug reports.

Signature · 6 lines
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx