diff options
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 47ca62fe7c3e..4b747bdaeea6 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -102,6 +102,7 @@ | |||
102 | static struct pci_device_id radeonfb_pci_table[] = { | 102 | static struct pci_device_id radeonfb_pci_table[] = { |
103 | /* Radeon Xpress 200m */ | 103 | /* Radeon Xpress 200m */ |
104 | CHIP_DEF(PCI_CHIP_RS480_5955, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), | 104 | CHIP_DEF(PCI_CHIP_RS480_5955, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), |
105 | CHIP_DEF(PCI_CHIP_RS482_5975, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), | ||
105 | /* Mobility M6 */ | 106 | /* Mobility M6 */ |
106 | CHIP_DEF(PCI_CHIP_RADEON_LY, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 107 | CHIP_DEF(PCI_CHIP_RADEON_LY, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
107 | CHIP_DEF(PCI_CHIP_RADEON_LZ, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 108 | CHIP_DEF(PCI_CHIP_RADEON_LZ, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
@@ -153,8 +154,6 @@ static struct pci_device_id radeonfb_pci_table[] = { | |||
153 | /* Mobility 9200 (M9+) */ | 154 | /* Mobility 9200 (M9+) */ |
154 | CHIP_DEF(PCI_CHIP_RV280_5C61, RV280, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 155 | CHIP_DEF(PCI_CHIP_RV280_5C61, RV280, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
155 | CHIP_DEF(PCI_CHIP_RV280_5C63, RV280, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 156 | CHIP_DEF(PCI_CHIP_RV280_5C63, RV280, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
156 | /*Mobility Xpress 200 */ | ||
157 | CHIP_DEF(PCI_CHIP_RS485_5975, R300, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), | ||
158 | /* 9200 */ | 157 | /* 9200 */ |
159 | CHIP_DEF(PCI_CHIP_RV280_5960, RV280, CHIP_HAS_CRTC2), | 158 | CHIP_DEF(PCI_CHIP_RV280_5960, RV280, CHIP_HAS_CRTC2), |
160 | CHIP_DEF(PCI_CHIP_RV280_5961, RV280, CHIP_HAS_CRTC2), | 159 | CHIP_DEF(PCI_CHIP_RV280_5961, RV280, CHIP_HAS_CRTC2), |
@@ -1285,7 +1284,8 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg | |||
1285 | if (rinfo->family == CHIP_FAMILY_R300 || | 1284 | if (rinfo->family == CHIP_FAMILY_R300 || |
1286 | rinfo->family == CHIP_FAMILY_RS300 || | 1285 | rinfo->family == CHIP_FAMILY_RS300 || |
1287 | rinfo->family == CHIP_FAMILY_R350 || | 1286 | rinfo->family == CHIP_FAMILY_R350 || |
1288 | rinfo->family == CHIP_FAMILY_RV350) { | 1287 | rinfo->family == CHIP_FAMILY_RV350 || |
1288 | rinfo->family == CHIP_FAMILY_RV380 ) { | ||
1289 | if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) { | 1289 | if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) { |
1290 | /* When restoring console mode, use saved PPLL_REF_DIV | 1290 | /* When restoring console mode, use saved PPLL_REF_DIV |
1291 | * setting. | 1291 | * setting. |