[PATCH xf86-video-amdgpu 3/7] Stop using generated amdgpu_device_match

Michel Dänzer michel at daenzer.net
Tue Nov 1 09:31:21 UTC 2016


From: Michel Dänzer <michel.daenzer at amd.com>

Just match on PCI device ID 0x1002.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/amdgpu_probe.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index 213d245..fb6f8a3 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -44,7 +44,6 @@
 #include "amdgpu_probe.h"
 #include "amdgpu_version.h"
 #include "amdgpu_drv.h"
-#include "amdpciids.h"
 
 #include "xf86.h"
 
@@ -59,12 +58,11 @@
 #include <xf86platformBus.h>
 #endif
 
+#include "ati_pciids_gen.h"
 #include "amdgpu_chipset_gen.h"
 
 #include "amdgpu_pci_chipset_gen.h"
 
-#include "amdgpu_pci_device_match_gen.h"
-
 _X_EXPORT int gAMDGPUEntityIndex = -1;
 
 /* Return the options for supported chipset 'n'; NULL otherwise */
@@ -386,6 +384,11 @@ error:
 }
 #endif
 
+static const struct pci_id_match amdgpu_device_match[] = {
+    {0x1002, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
+    {0, 0, 0},
+};
+
 _X_EXPORT DriverRec AMDGPU = {
 	AMDGPU_VERSION_CURRENT,
 	AMDGPU_DRIVER_NAME,
-- 
2.10.2



More information about the amd-gfx mailing list