summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-03-26 21:27:47 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-03-26 21:27:47 +0000
commit7fe3c102380417edd3f0d95ced7ff9db98cc869d (patch)
tree7409e3f0abe4feeebfeb564d90fc743b24e41cd6
parentfd6c3ced9a310121934ad19d774ed1e387aef875 (diff)
Still need to disable the PLL_DELAY errata on M6 chips. Confirmed by espie@
-rw-r--r--driver/xf86-video-ati/src/radeon_driver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c
index a11c758f4..a6aba7f0a 100644
--- a/driver/xf86-video-ati/src/radeon_driver.c
+++ b/driver/xf86-video-ati/src/radeon_driver.c
@@ -2902,6 +2902,11 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn)
info->ChipFamily == CHIP_FAMILY_RS200)
info->ChipErrata |= CHIP_ERRATA_PLL_DELAY;
+ /* Clear bit for M6 Chipsets */
+ if (info->Chipset == PCI_CHIP_RADEON_LY ||
+ info->Chipset == PCI_CHIP_RADEON_LZ)
+ info->ChipErrata &= ~CHIP_ERRATA_PLL_DELAY;
+
#ifdef XF86DRI
/* AGP/PCI */
/* Proper autodetection of an AGP capable device requires examining