r300: respect radeon common code fallbacks

[mesa.git] / src / gallium / winsys / drm / intel / xorg / intel_xorg.c

diff --git a/src/gallium/winsys/drm/intel/xorg/intel_xorg.c b/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
index aea39247e510946b16ccc495ab4434cc69b5c194..369dc356cf87c0b03f39a4ff486355ad1d46f5ba 100644 (file)
--- a/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
+++ b/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
@@ -37,21 +37,18 @@ static Bool intel_xorg_pci_probe(DriverPtr driver,
                                 intptr_t match_data);
 
 static const struct pci_id_match intel_xorg_device_match[] = {
-    {0x8086, 0x2592, 0xffff, 0xffff, 0, 0, 0},
-    {0x8086, 0x27A2, 0xffff, 0xffff, 0, 0, 0},
+    {0x8086, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
     {0, 0, 0},
 };
 
 static SymTabRec intel_xorg_chipsets[] = {
-    {0x2592, "Intel Graphics Device"},
-    {0x27A2, "Intel Graphics Device"},
+    {PCI_MATCH_ANY, "Intel Graphics Device"},
     {-1, NULL}
 };
 
 static PciChipsets intel_xorg_pci_devices[] = {
-    {0x2592, 0x2592, RES_SHARED_VGA},
-    {0x27A2, 0x27A2, RES_SHARED_VGA},
-    {-1, -1, RES_UNDEFINED}
+    {PCI_MATCH_ANY, PCI_MATCH_ANY, NULL},
+    {-1, -1, NULL}
 };
 
 static XF86ModuleVersionInfo intel_xorg_version = {
@@ -107,12 +104,6 @@ intel_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)
        setupDone = 1;
        xf86AddDriver(&modesetting, module, HaveDriverFuncs);
 
-       /*
-        * Tell the loader about symbols from other modules that this module
-        * might refer to.
-        */
-       xorg_tracker_loader_ref_sym_lists();
-
        /*
         * The return value must be non-NULL on success even though there
         * is no TearDownProc.
@@ -143,7 +134,7 @@ intel_xorg_pci_probe(DriverPtr driver,
                               NULL, NULL, NULL, NULL, NULL);
     if (scrn != NULL) {
        scrn->driverVersion = 1;
-       scrn->driverName = "modesetting";
+       scrn->driverName = "i915";
        scrn->name = "modesetting";
        scrn->Probe = NULL;