git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
drivers
/
video
/
aty
/
radeon_base.c
diff --git
a/drivers/video/aty/radeon_base.c
b/drivers/video/aty/radeon_base.c
index
4f01ccc
..
387a18a
100644
(file)
--- a/
drivers/video/aty/radeon_base.c
+++ b/
drivers/video/aty/radeon_base.c
@@
-594,7
+594,7
@@
static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
}
/*
}
/*
- * Retr
ei
ve PLL infos by different means (BIOS, Open Firmware, register probing...)
+ * Retr
ie
ve PLL infos by different means (BIOS, Open Firmware, register probing...)
*/
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
{
*/
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
{
@@
-660,17
+660,17
@@
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
#ifdef CONFIG_PPC_OF
/*
#ifdef CONFIG_PPC_OF
/*
- * Retr
ei
ve PLL infos from Open Firmware first
+ * Retr
ie
ve PLL infos from Open Firmware first
*/
if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
*/
if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
- printk(KERN_INFO "radeonfb: Retr
ei
ved PLL infos from Open Firmware\n");
+ printk(KERN_INFO "radeonfb: Retr
ie
ved PLL infos from Open Firmware\n");
goto found;
}
#endif /* CONFIG_PPC_OF */
/*
* Check out if we have an X86 which gave us some PLL informations
goto found;
}
#endif /* CONFIG_PPC_OF */
/*
* Check out if we have an X86 which gave us some PLL informations
- * and if yes, retr
ei
ve them
+ * and if yes, retr
ie
ve them
*/
if (!force_measure_pll && rinfo->bios_seg) {
u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
*/
if (!force_measure_pll && rinfo->bios_seg) {
u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
@@
-682,7
+682,7
@@
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
- printk(KERN_INFO "radeonfb: Retr
ei
ved PLL infos from BIOS\n");
+ printk(KERN_INFO "radeonfb: Retr
ie
ved PLL infos from BIOS\n");
goto found;
}
goto found;
}
@@
-691,7
+691,7
@@
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
* probe them
*/
if (radeon_probe_pll_params(rinfo) == 0) {
* probe them
*/
if (radeon_probe_pll_params(rinfo) == 0) {
- printk(KERN_INFO "radeonfb: Retr
ei
ved PLL infos from registers\n");
+ printk(KERN_INFO "radeonfb: Retr
ie
ved PLL infos from registers\n");
goto found;
}
goto found;
}
@@
-702,7
+702,7
@@
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
found:
/*
found:
/*
- * Some methods fail to retr
ei
ve SCLK and MCLK values, we apply default
+ * Some methods fail to retr
ie
ve SCLK and MCLK values, we apply default
* settings in this case (200Mhz). If that really happne often, we could
* fetch from registers instead...
*/
* settings in this case (200Mhz). If that really happne often, we could
* fetch from registers instead...
*/
@@
-864,8
+864,8
@@
static int radeonfb_pan_display (struct fb_var_screeninfo *var,
}
}
-static int radeonfb_ioctl (struct
inode *inode, struct file *file
, unsigned int cmd,
- unsigned long arg
, struct fb_info *info
)
+static int radeonfb_ioctl (struct
fb_info *info
, unsigned int cmd,
+ unsigned long arg)
{
struct radeonfb_info *rinfo = info->par;
unsigned int tmp;
{
struct radeonfb_info *rinfo = info->par;
unsigned int tmp;
@@
-1067,7
+1067,7
@@
static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
if (regno > 255)
if (regno > 255)
- return
1
;
+ return
-EINVAL
;
red >>= 8;
green >>= 8;
red >>= 8;
green >>= 8;
@@
-1086,9
+1086,9
@@
static int radeon_setcolreg (unsigned regno, unsigned red, unsigned green,
pindex = regno * 8;
if (rinfo->depth == 16 && regno > 63)
pindex = regno * 8;
if (rinfo->depth == 16 && regno > 63)
- return
1
;
+ return
-EINVAL
;
if (rinfo->depth == 15 && regno > 31)
if (rinfo->depth == 15 && regno > 31)
- return
1
;
+ return
-EINVAL
;
/* For 565, the green component is mixed one order
* below
/* For 565, the green component is mixed one order
* below
@@
-2265,7
+2265,7
@@
static struct bin_attribute edid2_attr = {
};
};
-static int radeonfb_pci_register (struct pci_dev *pdev,
+static int
__devinit
radeonfb_pci_register (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct fb_info *info;
const struct pci_device_id *ent)
{
struct fb_info *info;
@@
-2393,7
+2393,7
@@
static int radeonfb_pci_register (struct pci_dev *pdev,
rinfo->mapped_vram/1024);
/*
rinfo->mapped_vram/1024);
/*
- * Map the BIOS ROM if any and retr
ei
ve PLL parameters from
+ * Map the BIOS ROM if any and retr
ie
ve PLL parameters from
* the BIOS. We skip that on mobility chips as the real panel
* values we need aren't in the ROM but in the BIOS image in
* memory. This is definitely not the best meacnism though,
* the BIOS. We skip that on mobility chips as the real panel
* values we need aren't in the ROM but in the BIOS image in
* memory. This is definitely not the best meacnism though,