aboutsummaryrefslogtreecommitdiff
path: root/shared-core/drm_pciids.txt
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2005-05-21 02:27:51 +0000
committerIan Romanick <idr@us.ibm.com>2005-05-21 02:27:51 +0000
commita686be5bc8c5d8a260513b680f322e3b790aadf7 (patch)
treebe71a5caab8c261c913edf8f2423528ca99befde /shared-core/drm_pciids.txt
parentfced784140c7b347ea9d3091a8bc0c06c1a760f7 (diff)
Change the MGA initialization and cleanup a bit. The dev_private structure
is now allocated (and partially filled in) by the new mga_driver_preinit function. This allows the driver to detect the type of card (i.e., G200 class vs. G400 class) on its own. The chipset value passed to mga_dma_init is now ignored. This same technique is used by the radeon DRM. As a result of this, mga_driver_pretakedown was converted to mga_driver_postcleanup. This routine gets called in some other places than might be expected, and it sets the dev_private pointer to NULL. That little gem took over an hour to track down. :(
Diffstat (limited to 'shared-core/drm_pciids.txt')
-rw-r--r--shared-core/drm_pciids.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index d9b42e01..82cbdd46 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -110,9 +110,9 @@
0x1002 0x5452 0 "ATI Rage 128 Pro Ultra TR (AGP)"
[mga]
-0x102b 0x0521 0 "Matrox G200 (AGP)"
-0x102b 0x0525 0 "Matrox G400/G450 (AGP)"
-0x102b 0x2527 0 "Matrox G550 (AGP)"
+0x102b 0x0521 MGA_CARD_TYPE_G200 "Matrox G200 (AGP)"
+0x102b 0x0525 MGA_CARD_TYPE_G400 "Matrox G400/G450 (AGP)"
+0x102b 0x2527 MGA_CARD_TYPE_G400 "Matrox G550 (AGP)"
[mach64]
0x1002 0x4749 0 "3D Rage Pro"