summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authornick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-26 08:14:37 +0000
committernick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-26 08:14:37 +0000
commitc53c8027ac5b1cbcad59ee137015da49c522d2e2 (patch)
tree8fa5092f6d0f7c66ec1c08ad8d7de78e4a3de44f /drivers
parent5b81c1f4fc397d1cc32bebb5a987473573236e3c (diff)
downloadmpv-c53c8027ac5b1cbcad59ee137015da49c522d2e2.tar.bz2
mpv-c53c8027ac5b1cbcad59ee137015da49c522d2e2.tar.xz
Radeon2 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1968 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
-rw-r--r--drivers/radeon/radeon.h2
-rw-r--r--drivers/radeon/radeonfb.c19
2 files changed, 19 insertions, 2 deletions
diff --git a/drivers/radeon/radeon.h b/drivers/radeon/radeon.h
index 474cf353ab..955feb6adc 100644
--- a/drivers/radeon/radeon.h
+++ b/drivers/radeon/radeon.h
@@ -12,6 +12,8 @@
#define PCI_DEVICE_ID_RADEON_LY 0x4C59
#define PCI_DEVICE_ID_RADEON_LZ 0x4C5A
#define PCI_DEVICE_ID_RADEON_LW 0x4C57
+#define PCI_DEVICE_ID_R200_QL 0x514C
+#define PCI_DEVICE_ID_RV200_QW 0x5157
#define RADEON_REGSIZE 0x4000
diff --git a/drivers/radeon/radeonfb.c b/drivers/radeon/radeonfb.c
index aaa997adfa..0fd1ac764a 100644
--- a/drivers/radeon/radeonfb.c
+++ b/drivers/radeon/radeonfb.c
@@ -102,7 +102,9 @@ enum radeon_chips {
RADEON_QZ,
RADEON_LY,
RADEON_LZ,
- RADEON_LW
+ RADEON_LW,
+ R200_QL,
+ RV200_QW
};
enum radeon_montype
@@ -143,6 +145,8 @@ static struct pci_device_id radeonfb_pci_table[] __devinitdata = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LY, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LY},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LZ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LZ},
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LW},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_R200_QL, PCI_ANY_ID, PCI_ANY_ID, 0, 0, R200_QL},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RV200_QW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RV200_QW},
{ 0, }
};
MODULE_DEVICE_TABLE(pci, radeonfb_pci_table);
@@ -248,7 +252,7 @@ struct radeonfb_info {
struct radeon_regs state;
struct radeon_regs init_state;
- char name[14];
+ char name[17];
char ram_type[12];
int hasCRTC2;
@@ -256,6 +260,7 @@ struct radeonfb_info {
int dviDispType;
int hasTVout;
int isM7;
+ int isR200;
u32 mmio_base_phys;
u32 fb_base_phys;
@@ -794,6 +799,16 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
rinfo->isM7 = 1;
strcpy(rinfo->name, "Radeon M7 LW ");
break;
+ case PCI_DEVICE_ID_R200_QL:
+ rinfo->hasCRTC2 = 1;
+ rinfo->isR200 = 1;
+ strcpy(rinfo->name, "Radeon2 8500 LW ");
+ break;
+ case PCI_DEVICE_ID_RV200_QW:
+ rinfo->hasCRTC2 = 1;
+ rinfo->isM7 = 1;
+ strcpy(rinfo->name, "Radeon2 7500 QW ");
+ break;
default:
release_mem_region (rinfo->mmio_base_phys,
pci_resource_len(pdev, 2));