diff options
author | johan henriksson <jhn98032@gmail.com> | 2007-05-08 03:37:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:27 -0400 |
commit | dd1447134454b169d5ae353aceb93f2368db8547 (patch) | |
tree | 358071bb29654fdf8ae3b7dd53e050cc482c9f6d /drivers/video/aty/radeon_base.c | |
parent | abed5d15af4cf864b502b5b0402c7fb39c5c3371 (diff) |
radeonfb: Add support for Radeon xpress 200m
Added support for radeon xpress 200m(rs480). Note that the card doesn't
like dynclk turned on.
Signed-off-by: Johan Henriksson <jhn98032@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index a4b3fd185de7..0ec36cd5de28 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -100,6 +100,8 @@ | |||
100 | { PCI_VENDOR_ID_ATI, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (flags) | (CHIP_FAMILY_##family) } | 100 | { PCI_VENDOR_ID_ATI, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (flags) | (CHIP_FAMILY_##family) } |
101 | 101 | ||
102 | static struct pci_device_id radeonfb_pci_table[] = { | 102 | static struct pci_device_id radeonfb_pci_table[] = { |
103 | /* Radeon Xpress 200m */ | ||
104 | CHIP_DEF(PCI_CHIP_RS480_5955, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), | ||
103 | /* Mobility M6 */ | 105 | /* Mobility M6 */ |
104 | CHIP_DEF(PCI_CHIP_RADEON_LY, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 106 | CHIP_DEF(PCI_CHIP_RADEON_LY, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
105 | CHIP_DEF(PCI_CHIP_RADEON_LZ, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), | 107 | CHIP_DEF(PCI_CHIP_RADEON_LZ, RV100, CHIP_HAS_CRTC2 | CHIP_IS_MOBILITY), |
@@ -1994,7 +1996,8 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
1994 | /* framebuffer size */ | 1996 | /* framebuffer size */ |
1995 | if ((rinfo->family == CHIP_FAMILY_RS100) || | 1997 | if ((rinfo->family == CHIP_FAMILY_RS100) || |
1996 | (rinfo->family == CHIP_FAMILY_RS200) || | 1998 | (rinfo->family == CHIP_FAMILY_RS200) || |
1997 | (rinfo->family == CHIP_FAMILY_RS300)) { | 1999 | (rinfo->family == CHIP_FAMILY_RS300) || |
2000 | (rinfo->family == CHIP_FAMILY_RS480) ) { | ||
1998 | u32 tom = INREG(NB_TOM); | 2001 | u32 tom = INREG(NB_TOM); |
1999 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); | 2002 | tmp = ((((tom >> 16) - (tom & 0xffff) + 1) << 6) * 1024); |
2000 | 2003 | ||