summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2009-02-18 23:41:10 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2009-02-18 23:41:10 +0000
commit84c75e0a7ccb55b977b1f492d4d765b134f8b161 (patch)
tree8387be79b409000e330416f110c6e50be3ea80b5
parent6f6865a18f21f0e17a7d198d39a86162292fa969 (diff)
Disable all IGPGART chipsets in radeondrm for release.
The RS480 is just fucking evil, the RS690 works ONCE but doesn't on reboot, and i've never heard about a RS400 being tested, so disable that too for safety. This is so that only working chipsets make release, if I just removed your working chipset, please let me know. deraadt@ requested that I do this now, not later.
-rw-r--r--sys/dev/pci/drm/radeon_drv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/radeon_drv.c b/sys/dev/pci/drm/radeon_drv.c
index e23bdc4de9c..1295ee40f60 100644
--- a/sys/dev/pci/drm/radeon_drv.c
+++ b/sys/dev/pci/drm/radeon_drv.c
@@ -207,6 +207,7 @@ static drm_pci_id_list_t radeondrm_pciidlist[] = {
CHIP_RS300|RADEON_IS_IGP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_IGP9100,
CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY},
+#if 0
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480,
CHIP_RS480|RADEON_IS_IGP|RADEON_IS_IGPGART},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS480_B,
@@ -215,12 +216,14 @@ static drm_pci_id_list_t radeondrm_pciidlist[] = {
CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS482_B,
CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+#endif
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_PRO, CHIP_RV280},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280, CHIP_RV280},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_B, CHIP_RV280},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RV280_SE_S, CHIP_RV280},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_FIREMV_2200, CHIP_RV280},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_ES1000, CHIP_RV100},
+#if 0
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400,
CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS400_B,
@@ -229,6 +232,7 @@ static drm_pci_id_list_t radeondrm_pciidlist[] = {
CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RC410_B,
CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART},
+#endif
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X300,
CHIP_RV380|RADEON_NEW_MEMMAP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X600_RV370,
@@ -469,10 +473,12 @@ static drm_pci_id_list_t radeondrm_pciidlist[] = {
CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_RS350IGP,
CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP},
+#if 0
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250,
CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART},
{PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RADEON_X1250IGP,
CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART},
+#endif
{0, 0, 0}
};