diff options
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 652273e9f5f9..d0f1a7fc2c9d 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -1286,11 +1286,10 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg | |||
1286 | radeon_pll_errata_after_data(rinfo); | 1286 | radeon_pll_errata_after_data(rinfo); |
1287 | 1287 | ||
1288 | /* Set PPLL ref. div */ | 1288 | /* Set PPLL ref. div */ |
1289 | if (rinfo->family == CHIP_FAMILY_R300 || | 1289 | if (IS_R300_VARIANT(rinfo) || |
1290 | rinfo->family == CHIP_FAMILY_RS300 || | 1290 | rinfo->family == CHIP_FAMILY_RS300 || |
1291 | rinfo->family == CHIP_FAMILY_R350 || | 1291 | rinfo->family == CHIP_FAMILY_RS400 || |
1292 | rinfo->family == CHIP_FAMILY_RV350 || | 1292 | rinfo->family == CHIP_FAMILY_RS480) { |
1293 | rinfo->family == CHIP_FAMILY_RV380 ) { | ||
1294 | if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) { | 1293 | if (mode->ppll_ref_div & R300_PPLL_REF_DIV_ACC_MASK) { |
1295 | /* When restoring console mode, use saved PPLL_REF_DIV | 1294 | /* When restoring console mode, use saved PPLL_REF_DIV |
1296 | * setting. | 1295 | * setting. |
@@ -1461,10 +1460,7 @@ static void radeon_calc_pll_regs(struct radeonfb_info *rinfo, struct radeon_regs | |||
1461 | /* Not all chip revs have the same format for this register, | 1460 | /* Not all chip revs have the same format for this register, |
1462 | * extract the source selection | 1461 | * extract the source selection |
1463 | */ | 1462 | */ |
1464 | if (rinfo->family == CHIP_FAMILY_R200 || | 1463 | if (rinfo->family == CHIP_FAMILY_R200 || IS_R300_VARIANT(rinfo)) { |
1465 | rinfo->family == CHIP_FAMILY_R300 || | ||
1466 | rinfo->family == CHIP_FAMILY_R350 || | ||
1467 | rinfo->family == CHIP_FAMILY_RV350) { | ||
1468 | source = (fp2_gen_cntl >> 10) & 0x3; | 1464 | source = (fp2_gen_cntl >> 10) & 0x3; |
1469 | /* sourced from transform unit, check for transform unit | 1465 | /* sourced from transform unit, check for transform unit |
1470 | * own source | 1466 | * own source |
@@ -2005,6 +2001,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
2005 | (rinfo->family == CHIP_FAMILY_RS200) || | 2001 | (rinfo->family == CHIP_FAMILY_RS200) || |
2006 | (rinfo->family == CHIP_FAMILY_RS300) || | 2002 | (rinfo->family == CHIP_FAMILY_RS300) || |
2007 | (rinfo->family == CHIP_FAMILY_RC410) || | 2003 | (rinfo->family == CHIP_FAMILY_RC410) || |
2004 | (rinfo->family == CHIP_FAMILY_RS400) || | ||
2008 | (rinfo->family == CHIP_FAMILY_RS480) ) { | 2005 | (rinfo->family == CHIP_FAMILY_RS480) ) { |
2009 | u32 tom = INREG(NB_TOM); | 2006 | u32 tom = INREG(NB_TOM); |
2010 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); | 2007 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); |