patch-2.4.20 linux-2.4.20/drivers/video/radeonfb.c
Next file: linux-2.4.20/drivers/video/sis/300vtbl.h
Previous file: linux-2.4.20/drivers/video/radeon.h
Back to the patch index
Back to the overall index
- Lines: 82
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/drivers/video/radeonfb.c
- Orig date:
Fri Aug 2 17:39:45 2002
diff -urN linux-2.4.19/drivers/video/radeonfb.c linux-2.4.20/drivers/video/radeonfb.c
@@ -100,7 +100,8 @@
RADEON_QW, /* Radeon RV200 (7500) */
RADEON_LW, /* Radeon Mobility M7 */
RADEON_LY, /* Radeon Mobility M6 */
- RADEON_LZ /* Radeon Mobility M6 */
+ RADEON_LZ, /* Radeon Mobility M6 */
+ RADEON_PM /* Radeon Mobility P/M */
};
@@ -127,6 +128,7 @@
{ 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_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_PM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_PM},
{ 0, }
};
MODULE_DEVICE_TABLE(pci, radeonfb_pci_table);
@@ -258,8 +260,8 @@
u32 mmio_base_phys;
u32 fb_base_phys;
- u32 mmio_base;
- u32 fb_base;
+ unsigned long mmio_base;
+ unsigned long fb_base;
struct pci_dev *pdev;
@@ -361,7 +363,7 @@
} while (0)
-static __inline__ u32 _INPLL(struct radeonfb_info *rinfo, u32 addr)
+static __inline__ u32 _INPLL(struct radeonfb_info *rinfo, unsigned long addr)
{
OUTREG8(CLOCK_CNTL_INDEX, addr & 0x0000001f);
return (INREG(CLOCK_CNTL_DATA));
@@ -800,7 +802,7 @@
}
/* map the regions */
- rinfo->mmio_base = (u32) ioremap (rinfo->mmio_base_phys,
+ rinfo->mmio_base = (unsigned long)ioremap (rinfo->mmio_base_phys,
RADEON_REGSIZE);
if (!rinfo->mmio_base) {
printk ("radeonfb: cannot map MMIO\n");
@@ -856,6 +858,9 @@
strcpy(rinfo->name, "Radeon M6 LZ ");
rinfo->hasCRTC2 = 1;
break;
+ case PCI_DEVICE_ID_RADEON_PM:
+ strcpy(rinfo->name, "Radeon P/M ");
+ rinfo->hasCRTC2 = 1;
default:
return -ENODEV;
}
@@ -924,6 +929,7 @@
case PCI_DEVICE_ID_RADEON_LW:
case PCI_DEVICE_ID_RADEON_LY:
case PCI_DEVICE_ID_RADEON_LZ:
+ case PCI_DEVICE_ID_RADEON_PM:
rinfo->dviDisp_type = MT_LCD;
break;
default:
@@ -947,7 +953,7 @@
}
}
- rinfo->fb_base = (u32) ioremap (rinfo->fb_base_phys,
+ rinfo->fb_base = (unsigned long) ioremap (rinfo->fb_base_phys,
rinfo->video_ram);
if (!rinfo->fb_base) {
printk ("radeonfb: cannot map FB\n");
@@ -2864,6 +2870,7 @@
case PCI_DEVICE_ID_RADEON_LW:
case PCI_DEVICE_ID_RADEON_LY:
case PCI_DEVICE_ID_RADEON_LZ:
+ case PCI_DEVICE_ID_RADEON_PM:
break;
default:
return PBOOK_SLEEP_REFUSE;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)