Commit 729d6872 authored by Thomas Zimmermann's avatar Thomas Zimmermann

fbdev: Remove trailing whitespaces

Fix coding style. No functional changes.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220718072322.8927-2-tzimmermann@suse.de
parent 42542c79
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* - Convert to new framebuffer API, * - Convert to new framebuffer API,
* fix colormap setting at 16 bits/pixel (565) * fix colormap setting at 16 bits/pixel (565)
* *
* Paul Mundt * Paul Mundt
* - PCI hotplug * - PCI hotplug
* *
* Jon Smirl <jonsmirl@yahoo.com> * Jon Smirl <jonsmirl@yahoo.com>
...@@ -520,13 +520,13 @@ static const struct fb_ops aty128fb_ops = { ...@@ -520,13 +520,13 @@ static const struct fb_ops aty128fb_ops = {
* - endian conversions may possibly be avoided by * - endian conversions may possibly be avoided by
* using the other register aperture. TODO. * using the other register aperture. TODO.
*/ */
static inline u32 _aty_ld_le32(volatile unsigned int regindex, static inline u32 _aty_ld_le32(volatile unsigned int regindex,
const struct aty128fb_par *par) const struct aty128fb_par *par)
{ {
return readl (par->regbase + regindex); return readl (par->regbase + regindex);
} }
static inline void _aty_st_le32(volatile unsigned int regindex, u32 val, static inline void _aty_st_le32(volatile unsigned int regindex, u32 val,
const struct aty128fb_par *par) const struct aty128fb_par *par)
{ {
writel (val, par->regbase + regindex); writel (val, par->regbase + regindex);
...@@ -559,12 +559,12 @@ static inline void _aty_st_8(unsigned int regindex, u8 val, ...@@ -559,12 +559,12 @@ static inline void _aty_st_8(unsigned int regindex, u8 val,
static u32 _aty_ld_pll(unsigned int pll_index, static u32 _aty_ld_pll(unsigned int pll_index,
const struct aty128fb_par *par) const struct aty128fb_par *par)
{ {
aty_st_8(CLOCK_CNTL_INDEX, pll_index & 0x3F); aty_st_8(CLOCK_CNTL_INDEX, pll_index & 0x3F);
return aty_ld_le32(CLOCK_CNTL_DATA); return aty_ld_le32(CLOCK_CNTL_DATA);
} }
static void _aty_st_pll(unsigned int pll_index, u32 val, static void _aty_st_pll(unsigned int pll_index, u32 val,
const struct aty128fb_par *par) const struct aty128fb_par *par)
{ {
...@@ -619,7 +619,7 @@ static int register_test(const struct aty128fb_par *par) ...@@ -619,7 +619,7 @@ static int register_test(const struct aty128fb_par *par)
aty_st_le32(BIOS_0_SCRATCH, 0xAAAAAAAA); aty_st_le32(BIOS_0_SCRATCH, 0xAAAAAAAA);
if (aty_ld_le32(BIOS_0_SCRATCH) == 0xAAAAAAAA) if (aty_ld_le32(BIOS_0_SCRATCH) == 0xAAAAAAAA)
flag = 1; flag = 1;
} }
aty_st_le32(BIOS_0_SCRATCH, val); // restore value aty_st_le32(BIOS_0_SCRATCH, val); // restore value
...@@ -901,7 +901,7 @@ static void aty128_get_pllinfo(struct aty128fb_par *par, ...@@ -901,7 +901,7 @@ static void aty128_get_pllinfo(struct aty128fb_par *par,
bios_hdr = BIOS_IN16(0x48); bios_hdr = BIOS_IN16(0x48);
bios_pll = BIOS_IN16(bios_hdr + 0x30); bios_pll = BIOS_IN16(bios_hdr + 0x30);
par->constants.ppll_max = BIOS_IN32(bios_pll + 0x16); par->constants.ppll_max = BIOS_IN32(bios_pll + 0x16);
par->constants.ppll_min = BIOS_IN32(bios_pll + 0x12); par->constants.ppll_min = BIOS_IN32(bios_pll + 0x12);
par->constants.xclk = BIOS_IN16(bios_pll + 0x08); par->constants.xclk = BIOS_IN16(bios_pll + 0x08);
...@@ -913,7 +913,7 @@ static void aty128_get_pllinfo(struct aty128fb_par *par, ...@@ -913,7 +913,7 @@ static void aty128_get_pllinfo(struct aty128fb_par *par,
par->constants.xclk, par->constants.ref_divider, par->constants.xclk, par->constants.ref_divider,
par->constants.ref_clk); par->constants.ref_clk);
} }
#ifdef CONFIG_X86 #ifdef CONFIG_X86
static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par) static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)
...@@ -925,7 +925,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par) ...@@ -925,7 +925,7 @@ static void __iomem *aty128_find_mem_vbios(struct aty128fb_par *par)
*/ */
u32 segstart; u32 segstart;
unsigned char __iomem *rom_base = NULL; unsigned char __iomem *rom_base = NULL;
for (segstart=0x000c0000; segstart<0x000f0000; segstart+=0x00001000) { for (segstart=0x000c0000; segstart<0x000f0000; segstart+=0x00001000) {
rom_base = ioremap(segstart, 0x10000); rom_base = ioremap(segstart, 0x10000);
if (rom_base == NULL) if (rom_base == NULL)
...@@ -1118,12 +1118,12 @@ static int aty128_var_to_crtc(const struct fb_var_screeninfo *var, ...@@ -1118,12 +1118,12 @@ static int aty128_var_to_crtc(const struct fb_var_screeninfo *var,
v_sync_wid = 1; v_sync_wid = 1;
else if (v_sync_wid > 0x1f) /* 0x1f = max vwidth */ else if (v_sync_wid > 0x1f) /* 0x1f = max vwidth */
v_sync_wid = 0x1f; v_sync_wid = 0x1f;
v_sync_strt = v_disp + lower; v_sync_strt = v_disp + lower;
h_sync_pol = sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1; h_sync_pol = sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1;
v_sync_pol = sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1; v_sync_pol = sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1;
c_sync = sync & FB_SYNC_COMP_HIGH_ACT ? (1 << 4) : 0; c_sync = sync & FB_SYNC_COMP_HIGH_ACT ? (1 << 4) : 0;
crtc->gen_cntl = 0x3000000L | c_sync | (dst << 8); crtc->gen_cntl = 0x3000000L | c_sync | (dst << 8);
...@@ -1301,11 +1301,11 @@ static void aty128_set_lcd_enable(struct aty128fb_par *par, int on) ...@@ -1301,11 +1301,11 @@ static void aty128_set_lcd_enable(struct aty128fb_par *par, int on)
aty_st_le32(LVDS_GEN_CNTL, reg); aty_st_le32(LVDS_GEN_CNTL, reg);
#ifdef CONFIG_FB_ATY128_BACKLIGHT #ifdef CONFIG_FB_ATY128_BACKLIGHT
aty128_bl_set_power(info, FB_BLANK_UNBLANK); aty128_bl_set_power(info, FB_BLANK_UNBLANK);
#endif #endif
} else { } else {
#ifdef CONFIG_FB_ATY128_BACKLIGHT #ifdef CONFIG_FB_ATY128_BACKLIGHT
aty128_bl_set_power(info, FB_BLANK_POWERDOWN); aty128_bl_set_power(info, FB_BLANK_POWERDOWN);
#endif #endif
reg = aty_ld_le32(LVDS_GEN_CNTL); reg = aty_ld_le32(LVDS_GEN_CNTL);
reg |= LVDS_DISPLAY_DIS; reg |= LVDS_DISPLAY_DIS;
aty_st_le32(LVDS_GEN_CNTL, reg); aty_st_le32(LVDS_GEN_CNTL, reg);
...@@ -1481,7 +1481,7 @@ static int aty128_ddafifo(struct aty128_ddafifo *dsp, ...@@ -1481,7 +1481,7 @@ static int aty128_ddafifo(struct aty128_ddafifo *dsp,
* This actually sets the video mode. * This actually sets the video mode.
*/ */
static int aty128fb_set_par(struct fb_info *info) static int aty128fb_set_par(struct fb_info *info)
{ {
struct aty128fb_par *par = info->par; struct aty128fb_par *par = info->par;
u32 config; u32 config;
int err; int err;
...@@ -1595,7 +1595,7 @@ static int aty128_encode_var(struct fb_var_screeninfo *var, ...@@ -1595,7 +1595,7 @@ static int aty128_encode_var(struct fb_var_screeninfo *var,
var->accel_flags = par->accel_flags; var->accel_flags = par->accel_flags;
return 0; return 0;
} }
static int aty128fb_check_var(struct fb_var_screeninfo *var, static int aty128fb_check_var(struct fb_var_screeninfo *var,
...@@ -1979,12 +1979,12 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1979,12 +1979,12 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
/* PowerBook Titanium */ /* PowerBook Titanium */
if (of_machine_is_compatible("PowerBook3,2")) if (of_machine_is_compatible("PowerBook3,2"))
default_vmode = VMODE_1152_768_60; default_vmode = VMODE_1152_768_60;
if (default_cmode > 16) if (default_cmode > 16)
default_cmode = CMODE_32; default_cmode = CMODE_32;
else if (default_cmode > 8) else if (default_cmode > 8)
default_cmode = CMODE_16; default_cmode = CMODE_16;
else else
default_cmode = CMODE_8; default_cmode = CMODE_8;
if (mac_vmode_to_var(default_vmode, default_cmode, &var)) if (mac_vmode_to_var(default_vmode, default_cmode, &var))
...@@ -1994,7 +1994,7 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1994,7 +1994,7 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
{ {
if (mode_option) if (mode_option)
if (fb_find_mode(&var, info, mode_option, NULL, if (fb_find_mode(&var, info, mode_option, NULL,
0, &defaultmode, 8) == 0) 0, &defaultmode, 8) == 0)
var = default_var; var = default_var;
} }
...@@ -2301,7 +2301,7 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg) ...@@ -2301,7 +2301,7 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
struct aty128fb_par *par = info->par; struct aty128fb_par *par = info->par;
u32 value; u32 value;
int rc; int rc;
switch (cmd) { switch (cmd) {
case FBIO_ATY128_SET_MIRROR: case FBIO_ATY128_SET_MIRROR:
if (par->chip_gen != rage_M3) if (par->chip_gen != rage_M3)
...@@ -2313,8 +2313,8 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg) ...@@ -2313,8 +2313,8 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
par->crt_on = (value & 0x02) != 0; par->crt_on = (value & 0x02) != 0;
if (!par->crt_on && !par->lcd_on) if (!par->crt_on && !par->lcd_on)
par->lcd_on = 1; par->lcd_on = 1;
aty128_set_crt_enable(par, par->crt_on); aty128_set_crt_enable(par, par->crt_on);
aty128_set_lcd_enable(par, par->lcd_on); aty128_set_lcd_enable(par, par->lcd_on);
return 0; return 0;
case FBIO_ATY128_GET_MIRROR: case FBIO_ATY128_GET_MIRROR:
if (par->chip_gen != rage_M3) if (par->chip_gen != rage_M3)
...@@ -2331,7 +2331,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend) ...@@ -2331,7 +2331,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
if (!par->pdev->pm_cap) if (!par->pdev->pm_cap)
return; return;
/* Set the chip into the appropriate suspend mode (we use D2, /* Set the chip into the appropriate suspend mode (we use D2,
* D3 would require a complete re-initialisation of the chip, * D3 would require a complete re-initialisation of the chip,
* including PCI config registers, clocks, AGP configuration, ...) * including PCI config registers, clocks, AGP configuration, ...)
...@@ -2376,12 +2376,12 @@ static int aty128_pci_suspend_late(struct device *dev, pm_message_t state) ...@@ -2376,12 +2376,12 @@ static int aty128_pci_suspend_late(struct device *dev, pm_message_t state)
*/ */
return 0; return 0;
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
if (state.event == pdev->dev.power.power_state.event) if (state.event == pdev->dev.power.power_state.event)
return 0; return 0;
printk(KERN_DEBUG "aty128fb: suspending...\n"); printk(KERN_DEBUG "aty128fb: suspending...\n");
console_lock(); console_lock();
fb_set_suspend(info, 1); fb_set_suspend(info, 1);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Copyright 2000 Ani Joshi <ajoshi@kernel.crashing.org> * Copyright 2000 Ani Joshi <ajoshi@kernel.crashing.org>
* *
* i2c bits from Luca Tettamanti <kronos@kronoz.cjb.net> * i2c bits from Luca Tettamanti <kronos@kronoz.cjb.net>
* *
* Special thanks to ATI DevRel team for their hardware donations. * Special thanks to ATI DevRel team for their hardware donations.
* *
* ...Insert GPL boilerplate here... * ...Insert GPL boilerplate here...
...@@ -110,7 +110,7 @@ static const struct pci_device_id radeonfb_pci_table[] = { ...@@ -110,7 +110,7 @@ static const struct pci_device_id radeonfb_pci_table[] = {
/* Radeon IGP320M (U1) */ /* Radeon IGP320M (U1) */
CHIP_DEF(PCI_CHIP_RS100_4336, RS100, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), CHIP_DEF(PCI_CHIP_RS100_4336, RS100, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
/* Radeon IGP320 (A3) */ /* Radeon IGP320 (A3) */
CHIP_DEF(PCI_CHIP_RS100_4136, RS100, CHIP_HAS_CRTC2 | CHIP_IS_IGP), CHIP_DEF(PCI_CHIP_RS100_4136, RS100, CHIP_HAS_CRTC2 | CHIP_IS_IGP),
/* IGP330M/340M/350M (U2) */ /* IGP330M/340M/350M (U2) */
CHIP_DEF(PCI_CHIP_RS200_4337, RS200, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY), CHIP_DEF(PCI_CHIP_RS200_4337, RS200, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
/* IGP330/340/350 (A4) */ /* IGP330/340/350 (A4) */
...@@ -240,7 +240,7 @@ typedef struct { ...@@ -240,7 +240,7 @@ typedef struct {
* interfere with anything * interfere with anything
*/ */
static reg_val common_regs[] = { static reg_val common_regs[] = {
{ OVR_CLR, 0 }, { OVR_CLR, 0 },
{ OVR_WID_LEFT_RIGHT, 0 }, { OVR_WID_LEFT_RIGHT, 0 },
{ OVR_WID_TOP_BOTTOM, 0 }, { OVR_WID_TOP_BOTTOM, 0 },
{ OV0_SCALE_CNTL, 0 }, { OV0_SCALE_CNTL, 0 },
...@@ -255,7 +255,7 @@ static reg_val common_regs[] = { ...@@ -255,7 +255,7 @@ static reg_val common_regs[] = {
/* /*
* globals * globals
*/ */
static char *mode_option; static char *mode_option;
static char *monitor_layout; static char *monitor_layout;
static bool noaccel = 0; static bool noaccel = 0;
...@@ -422,7 +422,7 @@ static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev) ...@@ -422,7 +422,7 @@ static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
* ROM somewhere in the first meg. We will just ignore the copy * ROM somewhere in the first meg. We will just ignore the copy
* and use the ROM directly. * and use the ROM directly.
*/ */
/* Fix from ATI for problem with Radeon hardware not leaving ROM enabled */ /* Fix from ATI for problem with Radeon hardware not leaving ROM enabled */
unsigned int temp; unsigned int temp;
temp = INREG(MPP_TB_CONFIG); temp = INREG(MPP_TB_CONFIG);
...@@ -430,14 +430,14 @@ static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev) ...@@ -430,14 +430,14 @@ static int radeon_map_ROM(struct radeonfb_info *rinfo, struct pci_dev *dev)
temp |= 0x04 << 24; temp |= 0x04 << 24;
OUTREG(MPP_TB_CONFIG, temp); OUTREG(MPP_TB_CONFIG, temp);
temp = INREG(MPP_TB_CONFIG); temp = INREG(MPP_TB_CONFIG);
rom = pci_map_rom(dev, &rom_size); rom = pci_map_rom(dev, &rom_size);
if (!rom) { if (!rom) {
printk(KERN_ERR "radeonfb (%s): ROM failed to map\n", printk(KERN_ERR "radeonfb (%s): ROM failed to map\n",
pci_name(rinfo->pdev)); pci_name(rinfo->pdev));
return -ENOMEM; return -ENOMEM;
} }
rinfo->bios_seg = rom; rinfo->bios_seg = rom;
/* Very simple test to make sure it appeared */ /* Very simple test to make sure it appeared */
...@@ -515,7 +515,7 @@ static int radeon_find_mem_vbios(struct radeonfb_info *rinfo) ...@@ -515,7 +515,7 @@ static int radeon_find_mem_vbios(struct radeonfb_info *rinfo)
*/ */
u32 segstart; u32 segstart;
void __iomem *rom_base = NULL; void __iomem *rom_base = NULL;
for(segstart=0x000c0000; segstart<0x000f0000; segstart+=0x00001000) { for(segstart=0x000c0000; segstart<0x000f0000; segstart+=0x00001000) {
rom_base = ioremap(segstart, 0x10000); rom_base = ioremap(segstart, 0x10000);
if (rom_base == NULL) if (rom_base == NULL)
...@@ -605,16 +605,16 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ...@@ -605,16 +605,16 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
for(i=0; i<1000000; i++) for(i=0; i<1000000; i++)
if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0) if (((INREG(CRTC_VLINE_CRNT_VLINE) >> 16) & 0x3ff) == 0)
break; break;
stop_time = ktime_get(); stop_time = ktime_get();
local_irq_enable(); local_irq_enable();
total_usecs = ktime_us_delta(stop_time, start_time); total_usecs = ktime_us_delta(stop_time, start_time);
if (total_usecs >= 10 * USEC_PER_SEC || total_usecs == 0) if (total_usecs >= 10 * USEC_PER_SEC || total_usecs == 0)
return -1; return -1;
hz = USEC_PER_SEC/(u32)total_usecs; hz = USEC_PER_SEC/(u32)total_usecs;
hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8; hTotal = ((INREG(CRTC_H_TOTAL_DISP) & 0x1ff) + 1) * 8;
vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1); vTotal = ((INREG(CRTC_V_TOTAL_DISP) & 0x3ff) + 1);
vclk = (long long)hTotal * (long long)vTotal * hz; vclk = (long long)hTotal * (long long)vTotal * hz;
...@@ -662,7 +662,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo) ...@@ -662,7 +662,7 @@ static int radeon_probe_pll_params(struct radeonfb_info *rinfo)
denom *= 3; denom *= 3;
break; break;
case 6: case 6:
denom *= 6; denom *= 6;
break; break;
case 7: case 7:
denom *= 12; denom *= 12;
...@@ -878,7 +878,7 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in ...@@ -878,7 +878,7 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in
v.green.length = 6; v.green.length = 6;
v.blue.length = 5; v.blue.length = 5;
v.transp.offset = v.transp.length = 0; v.transp.offset = v.transp.length = 0;
break; break;
case 24: case 24:
nom = 4; nom = 4;
den = 1; den = 1;
...@@ -908,7 +908,7 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in ...@@ -908,7 +908,7 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in
v.yres_virtual = v.yres; v.yres_virtual = v.yres;
if (v.xres_virtual < v.xres) if (v.xres_virtual < v.xres)
v.xres_virtual = v.xres; v.xres_virtual = v.xres;
/* XXX I'm adjusting xres_virtual to the pitch, that may help XFree /* XXX I'm adjusting xres_virtual to the pitch, that may help XFree
* with some panels, though I don't quite like this solution * with some panels, though I don't quite like this solution
...@@ -929,14 +929,14 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in ...@@ -929,14 +929,14 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in
if (v.xoffset > v.xres_virtual - v.xres) if (v.xoffset > v.xres_virtual - v.xres)
v.xoffset = v.xres_virtual - v.xres - 1; v.xoffset = v.xres_virtual - v.xres - 1;
if (v.yoffset > v.yres_virtual - v.yres) if (v.yoffset > v.yres_virtual - v.yres)
v.yoffset = v.yres_virtual - v.yres - 1; v.yoffset = v.yres_virtual - v.yres - 1;
v.red.msb_right = v.green.msb_right = v.blue.msb_right = v.red.msb_right = v.green.msb_right = v.blue.msb_right =
v.transp.offset = v.transp.length = v.transp.offset = v.transp.length =
v.transp.msb_right = 0; v.transp.msb_right = 0;
memcpy(var, &v, sizeof(v)); memcpy(var, &v, sizeof(v));
return 0; return 0;
...@@ -951,7 +951,7 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var, ...@@ -951,7 +951,7 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,
if ((var->xoffset + info->var.xres > info->var.xres_virtual) if ((var->xoffset + info->var.xres > info->var.xres_virtual)
|| (var->yoffset + info->var.yres > info->var.yres_virtual)) || (var->yoffset + info->var.yres > info->var.yres_virtual))
return -EINVAL; return -EINVAL;
if (rinfo->asleep) if (rinfo->asleep)
return 0; return 0;
...@@ -1151,7 +1151,7 @@ static int radeonfb_blank (int blank, struct fb_info *info) ...@@ -1151,7 +1151,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
if (rinfo->asleep) if (rinfo->asleep)
return 0; return 0;
return radeon_screen_blank(rinfo, blank, 0); return radeon_screen_blank(rinfo, blank, 0);
} }
...@@ -1401,7 +1401,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg ...@@ -1401,7 +1401,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
} else { } else {
/* R300 uses ref_div_acc field as real ref divider */ /* R300 uses ref_div_acc field as real ref divider */
OUTPLLP(PPLL_REF_DIV, OUTPLLP(PPLL_REF_DIV,
(mode->ppll_ref_div << R300_PPLL_REF_DIV_ACC_SHIFT), (mode->ppll_ref_div << R300_PPLL_REF_DIV_ACC_SHIFT),
~R300_PPLL_REF_DIV_ACC_MASK); ~R300_PPLL_REF_DIV_ACC_MASK);
} }
} else } else
...@@ -1423,7 +1423,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg ...@@ -1423,7 +1423,7 @@ static void radeon_write_pll_regs(struct radeonfb_info *rinfo, struct radeon_reg
workaround shouldn't have any effect on them. */ workaround shouldn't have any effect on them. */
for (i = 0; (i < 10000 && INPLL(PPLL_REF_DIV) & PPLL_ATOMIC_UPDATE_R); i++) for (i = 0; (i < 10000 && INPLL(PPLL_REF_DIV) & PPLL_ATOMIC_UPDATE_R); i++)
; ;
OUTPLL(HTOTAL_CNTL, 0); OUTPLL(HTOTAL_CNTL, 0);
/* Clear reset & atomic update */ /* Clear reset & atomic update */
...@@ -1510,7 +1510,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode, ...@@ -1510,7 +1510,7 @@ void radeon_write_mode (struct radeonfb_info *rinfo, struct radeon_regs *mode,
radeon_fifo_wait(2); radeon_fifo_wait(2);
OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl); OUTPLL(VCLK_ECP_CNTL, mode->vclk_ecp_cntl);
return; return;
} }
...@@ -1735,7 +1735,7 @@ static int radeonfb_set_par(struct fb_info *info) ...@@ -1735,7 +1735,7 @@ static int radeonfb_set_par(struct fb_info *info)
/* Clear auto-center etc... */ /* Clear auto-center etc... */
newmode->crtc_more_cntl = rinfo->init_state.crtc_more_cntl; newmode->crtc_more_cntl = rinfo->init_state.crtc_more_cntl;
newmode->crtc_more_cntl &= 0xfffffff0; newmode->crtc_more_cntl &= 0xfffffff0;
if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) { if ((primary_mon == MT_DFP) || (primary_mon == MT_LCD)) {
newmode->crtc_ext_cntl = VGA_ATI_LINEAR | XCRT_CNT_EN; newmode->crtc_ext_cntl = VGA_ATI_LINEAR | XCRT_CNT_EN;
if (mirror) if (mirror)
...@@ -1793,7 +1793,7 @@ static int radeonfb_set_par(struct fb_info *info) ...@@ -1793,7 +1793,7 @@ static int radeonfb_set_par(struct fb_info *info)
newmode->surface_cntl |= NONSURF_AP0_SWP_16BPP; newmode->surface_cntl |= NONSURF_AP0_SWP_16BPP;
newmode->surface_cntl |= NONSURF_AP1_SWP_16BPP; newmode->surface_cntl |= NONSURF_AP1_SWP_16BPP;
break; break;
case 24: case 24:
case 32: case 32:
newmode->surface_cntl |= NONSURF_AP0_SWP_32BPP; newmode->surface_cntl |= NONSURF_AP0_SWP_32BPP;
newmode->surface_cntl |= NONSURF_AP1_SWP_32BPP; newmode->surface_cntl |= NONSURF_AP1_SWP_32BPP;
...@@ -2028,7 +2028,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo) ...@@ -2028,7 +2028,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
} }
save_crtc_gen_cntl = INREG(CRTC_GEN_CNTL); save_crtc_gen_cntl = INREG(CRTC_GEN_CNTL);
save_crtc_ext_cntl = INREG(CRTC_EXT_CNTL); save_crtc_ext_cntl = INREG(CRTC_EXT_CNTL);
OUTREG(CRTC_EXT_CNTL, save_crtc_ext_cntl | CRTC_DISPLAY_DIS); OUTREG(CRTC_EXT_CNTL, save_crtc_ext_cntl | CRTC_DISPLAY_DIS);
OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl | CRTC_DISP_REQ_EN_B); OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl | CRTC_DISP_REQ_EN_B);
mdelay(100); mdelay(100);
...@@ -2038,7 +2038,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo) ...@@ -2038,7 +2038,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
#ifdef SET_MC_FB_FROM_APERTURE #ifdef SET_MC_FB_FROM_APERTURE
/* Set framebuffer to be at the same address as set in PCI BAR */ /* Set framebuffer to be at the same address as set in PCI BAR */
OUTREG(MC_FB_LOCATION, OUTREG(MC_FB_LOCATION,
((aper_base + aper_size - 1) & 0xffff0000) | (aper_base >> 16)); ((aper_base + aper_size - 1) & 0xffff0000) | (aper_base >> 16));
rinfo->fb_local_base = aper_base; rinfo->fb_local_base = aper_base;
#else #else
...@@ -2079,7 +2079,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo) ...@@ -2079,7 +2079,7 @@ static void fixup_memory_mappings(struct radeonfb_info *rinfo)
OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl); OUTREG(CRTC_GEN_CNTL, save_crtc_gen_cntl);
OUTREG(CRTC_EXT_CNTL, save_crtc_ext_cntl); OUTREG(CRTC_EXT_CNTL, save_crtc_ext_cntl);
if (rinfo->has_CRTC2) if (rinfo->has_CRTC2)
OUTREG(CRTC2_GEN_CNTL, save_crtc2_gen_cntl); OUTREG(CRTC2_GEN_CNTL, save_crtc2_gen_cntl);
pr_debug("aper_base: %08x MC_FB_LOC to: %08x, MC_AGP_LOC to: %08x\n", pr_debug("aper_base: %08x MC_FB_LOC to: %08x, MC_AGP_LOC to: %08x\n",
aper_base, aper_base,
...@@ -2265,7 +2265,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, ...@@ -2265,7 +2265,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev,
int err = 0; int err = 0;
pr_debug("radeonfb_pci_register BEGIN\n"); pr_debug("radeonfb_pci_register BEGIN\n");
/* Enable device in PCI config */ /* Enable device in PCI config */
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);
if (ret < 0) { if (ret < 0) {
...@@ -2280,9 +2280,9 @@ static int radeonfb_pci_register(struct pci_dev *pdev, ...@@ -2280,9 +2280,9 @@ static int radeonfb_pci_register(struct pci_dev *pdev,
goto err_disable; goto err_disable;
} }
rinfo = info->par; rinfo = info->par;
rinfo->info = info; rinfo->info = info;
rinfo->pdev = pdev; rinfo->pdev = pdev;
spin_lock_init(&rinfo->reg_lock); spin_lock_init(&rinfo->reg_lock);
timer_setup(&rinfo->lvds_timer, radeon_lvds_timer_func, 0); timer_setup(&rinfo->lvds_timer, radeon_lvds_timer_func, 0);
...@@ -2521,7 +2521,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev) ...@@ -2521,7 +2521,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
if (!rinfo) if (!rinfo)
return; return;
...@@ -2540,7 +2540,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev) ...@@ -2540,7 +2540,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev)
iounmap(rinfo->mmio_base); iounmap(rinfo->mmio_base);
iounmap(rinfo->fb_base); iounmap(rinfo->fb_base);
pci_release_region(pdev, 2); pci_release_region(pdev, 2);
pci_release_region(pdev, 0); pci_release_region(pdev, 0);
...@@ -2550,7 +2550,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev) ...@@ -2550,7 +2550,7 @@ static void radeonfb_pci_unregister(struct pci_dev *pdev)
fb_destroy_modedb(rinfo->mon1_modedb); fb_destroy_modedb(rinfo->mon1_modedb);
#ifdef CONFIG_FB_RADEON_I2C #ifdef CONFIG_FB_RADEON_I2C
radeon_delete_i2c_busses(rinfo); radeon_delete_i2c_busses(rinfo);
#endif #endif
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
framebuffer_release(info); framebuffer_release(info);
} }
......
...@@ -122,7 +122,7 @@ static int chipsfb_set_par(struct fb_info *info) ...@@ -122,7 +122,7 @@ static int chipsfb_set_par(struct fb_info *info)
info->var.blue.offset = 0; info->var.blue.offset = 0;
info->var.red.length = info->var.green.length = info->var.red.length = info->var.green.length =
info->var.blue.length = 5; info->var.blue.length = 5;
} else { } else {
/* p->var.bits_per_pixel == 8 */ /* p->var.bits_per_pixel == 8 */
write_cr(0x13, 100); // Set line length (doublewords) write_cr(0x13, 100); // Set line length (doublewords)
...@@ -131,13 +131,13 @@ static int chipsfb_set_par(struct fb_info *info) ...@@ -131,13 +131,13 @@ static int chipsfb_set_par(struct fb_info *info)
write_xr(0x20, 0x00); // 8 bit blitter mode write_xr(0x20, 0x00); // 8 bit blitter mode
info->fix.line_length = 800; info->fix.line_length = 800;
info->fix.visual = FB_VISUAL_PSEUDOCOLOR; info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
info->var.red.offset = info->var.green.offset = info->var.red.offset = info->var.green.offset =
info->var.blue.offset = 0; info->var.blue.offset = 0;
info->var.red.length = info->var.green.length = info->var.red.length = info->var.green.length =
info->var.blue.length = 8; info->var.blue.length = 8;
} }
return 0; return 0;
} }
......
This diff is collapsed.
...@@ -86,7 +86,7 @@ enum { ...@@ -86,7 +86,7 @@ enum {
SSTATUS = 36, /* 0x90 */ SSTATUS = 36, /* 0x90 */
PRC = 37, /* 0x94 */ PRC = 37, /* 0x94 */
#if 0 #if 0
/* PCI Registers */ /* PCI Registers */
DVID = 0x00000000L, DVID = 0x00000000L,
SC = 0x00000004L, SC = 0x00000004L,
...@@ -103,8 +103,8 @@ enum { ...@@ -103,8 +103,8 @@ enum {
PDATA = 0x04, PDATA = 0x04,
PPMASK = 0x08, PPMASK = 0x08,
PADDRR = 0x0c, PADDRR = 0x0c,
PIDXLO = 0x10, PIDXLO = 0x10,
PIDXHI = 0x14, PIDXHI = 0x14,
PIDXDATA= 0x18, PIDXDATA= 0x18,
PIDXCTL = 0x1c PIDXCTL = 0x1c
}; };
...@@ -131,7 +131,7 @@ enum { ...@@ -131,7 +131,7 @@ enum {
SYSCLKC = 0x18, /* () System Clock C */ SYSCLKC = 0x18, /* () System Clock C */
/* /*
* Dot clock rate is 20MHz * (m + 1) / ((n + 1) * (p ? 2 * p : 1) * Dot clock rate is 20MHz * (m + 1) / ((n + 1) * (p ? 2 * p : 1)
* c is charge pump bias which depends on the VCO frequency * c is charge pump bias which depends on the VCO frequency
*/ */
PIXM0 = 0x20, /* () Pixel M 0 */ PIXM0 = 0x20, /* () Pixel M 0 */
PIXN0 = 0x21, /* () Pixel N 0 */ PIXN0 = 0x21, /* () Pixel N 0 */
...@@ -320,7 +320,7 @@ struct imstt_par { ...@@ -320,7 +320,7 @@ struct imstt_par {
__u32 ramdac; __u32 ramdac;
__u32 palette[16]; __u32 palette[16];
}; };
enum { enum {
IBM = 0, IBM = 0,
TVP = 1 TVP = 1
...@@ -373,7 +373,7 @@ static struct imstt_regvals tvp_reg_init_17 = { ...@@ -373,7 +373,7 @@ static struct imstt_regvals tvp_reg_init_17 = {
static struct imstt_regvals tvp_reg_init_18 = { static struct imstt_regvals tvp_reg_init_18 = {
1152, 1152,
0x0009, 0x0011, 0x059, 0x5b, 0x0003, 0x0031, 0x0397, 0x039a, 0x0000, 0x0009, 0x0011, 0x059, 0x5b, 0x0003, 0x0031, 0x0397, 0x039a, 0x0000,
0xfd, 0x3a, 0xf1, 0xfd, 0x3a, 0xf1,
{ 0x39, 0x38, 0x38 }, { 0xf3, 0xf3, 0xf2 } { 0x39, 0x38, 0x38 }, { 0xf3, 0xf3, 0xf2 }
}; };
...@@ -856,10 +856,10 @@ imsttfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -856,10 +856,10 @@ imsttfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
} }
static int static int
imsttfb_set_par(struct fb_info *info) imsttfb_set_par(struct fb_info *info)
{ {
struct imstt_par *par = info->par; struct imstt_par *par = info->par;
if (!compute_imstt_regvals(par, info->var.xres, info->var.yres)) if (!compute_imstt_regvals(par, info->var.xres, info->var.yres))
return -EINVAL; return -EINVAL;
...@@ -930,7 +930,7 @@ imsttfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -930,7 +930,7 @@ imsttfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
return 0; return 0;
} }
static int static int
imsttfb_blank(int blank, struct fb_info *info) imsttfb_blank(int blank, struct fb_info *info)
{ {
struct imstt_par *par = info->par; struct imstt_par *par = info->par;
...@@ -986,7 +986,7 @@ imsttfb_blank(int blank, struct fb_info *info) ...@@ -986,7 +986,7 @@ imsttfb_blank(int blank, struct fb_info *info)
static void static void
imsttfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) imsttfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
{ {
struct imstt_par *par = info->par; struct imstt_par *par = info->par;
__u32 Bpp, line_pitch, bgc, dx, dy, width, height; __u32 Bpp, line_pitch, bgc, dx, dy, width, height;
...@@ -1192,7 +1192,7 @@ imstt_set_cursor(struct imstt_par *par, struct fb_image *d, int on) ...@@ -1192,7 +1192,7 @@ imstt_set_cursor(struct imstt_par *par, struct fb_image *d, int on)
} }
} }
static int static int
imsttfb_cursor(struct fb_info *info, struct fb_cursor *cursor) imsttfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
{ {
struct imstt_par *par = info->par; struct imstt_par *par = info->par;
...@@ -1200,7 +1200,7 @@ imsttfb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1200,7 +1200,7 @@ imsttfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
if (cursor->dest == NULL && cursor->rop == ROP_XOR) if (cursor->dest == NULL && cursor->rop == ROP_XOR)
return 1; return 1;
imstt_set_cursor(info, cursor, 0); imstt_set_cursor(info, cursor, 0);
if (flags & FB_CUR_SETPOS) { if (flags & FB_CUR_SETPOS) {
...@@ -1470,7 +1470,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1470,7 +1470,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct fb_info *info; struct fb_info *info;
struct device_node *dp; struct device_node *dp;
int ret = -ENOMEM; int ret = -ENOMEM;
dp = pci_device_to_OF_node(pdev); dp = pci_device_to_OF_node(pdev);
if(dp) if(dp)
printk(KERN_INFO "%s: OF name %pOFn\n",__func__, dp); printk(KERN_INFO "%s: OF name %pOFn\n",__func__, dp);
...@@ -1619,7 +1619,7 @@ static int __init imsttfb_init(void) ...@@ -1619,7 +1619,7 @@ static int __init imsttfb_init(void)
#endif #endif
return pci_register_driver(&imsttfb_pci_driver); return pci_register_driver(&imsttfb_pci_driver);
} }
static void __exit imsttfb_exit(void) static void __exit imsttfb_exit(void)
{ {
pci_unregister_driver(&imsttfb_pci_driver); pci_unregister_driver(&imsttfb_pci_driver);
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
* *
* 0.3.3 * 0.3.3
* - Porting over to new fbdev api. (jsimmons) * - Porting over to new fbdev api. (jsimmons)
* *
* 0.3.2 * 0.3.2
* - got rid of all floating point (dok) * - got rid of all floating point (dok)
* *
* 0.3.1 * 0.3.1
* - added module license (dok) * - added module license (dok)
...@@ -1154,14 +1154,14 @@ static int neofb_set_par(struct fb_info *info) ...@@ -1154,14 +1154,14 @@ static int neofb_set_par(struct fb_info *info)
switch (info->fix.accel) { switch (info->fix.accel) {
case FB_ACCEL_NEOMAGIC_NM2200: case FB_ACCEL_NEOMAGIC_NM2200:
case FB_ACCEL_NEOMAGIC_NM2230: case FB_ACCEL_NEOMAGIC_NM2230:
case FB_ACCEL_NEOMAGIC_NM2360: case FB_ACCEL_NEOMAGIC_NM2360:
case FB_ACCEL_NEOMAGIC_NM2380: case FB_ACCEL_NEOMAGIC_NM2380:
neo2200_accel_init(info, &info->var); neo2200_accel_init(info, &info->var);
break; break;
default: default:
break; break;
} }
return 0; return 0;
} }
...@@ -1493,15 +1493,15 @@ neofb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) ...@@ -1493,15 +1493,15 @@ neofb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
{ {
switch (info->fix.accel) { switch (info->fix.accel) {
case FB_ACCEL_NEOMAGIC_NM2200: case FB_ACCEL_NEOMAGIC_NM2200:
case FB_ACCEL_NEOMAGIC_NM2230: case FB_ACCEL_NEOMAGIC_NM2230:
case FB_ACCEL_NEOMAGIC_NM2360: case FB_ACCEL_NEOMAGIC_NM2360:
case FB_ACCEL_NEOMAGIC_NM2380: case FB_ACCEL_NEOMAGIC_NM2380:
neo2200_fillrect(info, rect); neo2200_fillrect(info, rect);
break; break;
default: default:
cfb_fillrect(info, rect); cfb_fillrect(info, rect);
break; break;
} }
} }
static void static void
...@@ -1509,15 +1509,15 @@ neofb_copyarea(struct fb_info *info, const struct fb_copyarea *area) ...@@ -1509,15 +1509,15 @@ neofb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{ {
switch (info->fix.accel) { switch (info->fix.accel) {
case FB_ACCEL_NEOMAGIC_NM2200: case FB_ACCEL_NEOMAGIC_NM2200:
case FB_ACCEL_NEOMAGIC_NM2230: case FB_ACCEL_NEOMAGIC_NM2230:
case FB_ACCEL_NEOMAGIC_NM2360: case FB_ACCEL_NEOMAGIC_NM2360:
case FB_ACCEL_NEOMAGIC_NM2380: case FB_ACCEL_NEOMAGIC_NM2380:
neo2200_copyarea(info, area); neo2200_copyarea(info, area);
break; break;
default: default:
cfb_copyarea(info, area); cfb_copyarea(info, area);
break; break;
} }
} }
static void static void
...@@ -1536,20 +1536,20 @@ neofb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -1536,20 +1536,20 @@ neofb_imageblit(struct fb_info *info, const struct fb_image *image)
} }
} }
static int static int
neofb_sync(struct fb_info *info) neofb_sync(struct fb_info *info)
{ {
switch (info->fix.accel) { switch (info->fix.accel) {
case FB_ACCEL_NEOMAGIC_NM2200: case FB_ACCEL_NEOMAGIC_NM2200:
case FB_ACCEL_NEOMAGIC_NM2230: case FB_ACCEL_NEOMAGIC_NM2230:
case FB_ACCEL_NEOMAGIC_NM2360: case FB_ACCEL_NEOMAGIC_NM2360:
case FB_ACCEL_NEOMAGIC_NM2380: case FB_ACCEL_NEOMAGIC_NM2380:
neo2200_sync(info); neo2200_sync(info);
break; break;
default: default:
break; break;
} }
return 0; return 0;
} }
/* /*
......
...@@ -474,7 +474,7 @@ static inline void reverse_order(u32 *l) ...@@ -474,7 +474,7 @@ static inline void reverse_order(u32 *l)
* DESCRIPTiON: * DESCRIPTiON:
* Loads cursor image based on a monochrome source and mask bitmap. The * Loads cursor image based on a monochrome source and mask bitmap. The
* image bits determines the color of the pixel, 0 for background, 1 for * image bits determines the color of the pixel, 0 for background, 1 for
* foreground. Only the affected region (as determined by @w and @h * foreground. Only the affected region (as determined by @w and @h
* parameters) will be updated. * parameters) will be updated.
* *
* CALLED FROM: * CALLED FROM:
...@@ -494,7 +494,7 @@ static void rivafb_load_cursor_image(struct riva_par *par, u8 *data8, ...@@ -494,7 +494,7 @@ static void rivafb_load_cursor_image(struct riva_par *par, u8 *data8,
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
b = *data++; b = *data++;
reverse_order(&b); reverse_order(&b);
for (j = 0; j < w/2; j++) { for (j = 0; j < w/2; j++) {
tmp = 0; tmp = 0;
#if defined (__BIG_ENDIAN) #if defined (__BIG_ENDIAN)
...@@ -562,7 +562,7 @@ static void riva_rclut(RIVA_HW_INST *chip, ...@@ -562,7 +562,7 @@ static void riva_rclut(RIVA_HW_INST *chip,
unsigned char regnum, unsigned char *red, unsigned char regnum, unsigned char *red,
unsigned char *green, unsigned char *blue) unsigned char *green, unsigned char *blue)
{ {
VGA_WR08(chip->PDIO, 0x3c7, regnum); VGA_WR08(chip->PDIO, 0x3c7, regnum);
*red = VGA_RD08(chip->PDIO, 0x3c9); *red = VGA_RD08(chip->PDIO, 0x3c9);
*green = VGA_RD08(chip->PDIO, 0x3c9); *green = VGA_RD08(chip->PDIO, 0x3c9);
...@@ -673,7 +673,7 @@ static int riva_load_video_mode(struct fb_info *info) ...@@ -673,7 +673,7 @@ static int riva_load_video_mode(struct fb_info *info)
int rc; int rc;
struct riva_par *par = info->par; struct riva_par *par = info->par;
struct riva_regs newmode; struct riva_regs newmode;
NVTRACE_ENTER(); NVTRACE_ENTER();
/* time to calculate */ /* time to calculate */
rivafb_blank(FB_BLANK_NORMAL, info); rivafb_blank(FB_BLANK_NORMAL, info);
...@@ -717,7 +717,7 @@ static int riva_load_video_mode(struct fb_info *info) ...@@ -717,7 +717,7 @@ static int riva_load_video_mode(struct fb_info *info)
hBlankEnd = hTotal + 4; hBlankEnd = hTotal + 4;
} }
newmode.crtc[0x0] = Set8Bits (hTotal); newmode.crtc[0x0] = Set8Bits (hTotal);
newmode.crtc[0x1] = Set8Bits (hDisplay); newmode.crtc[0x1] = Set8Bits (hDisplay);
newmode.crtc[0x2] = Set8Bits (hBlankStart); newmode.crtc[0x2] = Set8Bits (hBlankStart);
newmode.crtc[0x3] = SetBitField (hBlankEnd, 4: 0, 4:0) | SetBit (7); newmode.crtc[0x3] = SetBitField (hBlankEnd, 4: 0, 4:0) | SetBit (7);
...@@ -748,20 +748,20 @@ static int riva_load_video_mode(struct fb_info *info) ...@@ -748,20 +748,20 @@ static int riva_load_video_mode(struct fb_info *info)
| SetBitField(vStart,10:10,2:2) | SetBitField(vStart,10:10,2:2)
| SetBitField(vDisplay,10:10,1:1) | SetBitField(vDisplay,10:10,1:1)
| SetBitField(vTotal,10:10,0:0); | SetBitField(vTotal,10:10,0:0);
newmode.ext.horiz = SetBitField(hTotal,8:8,0:0) newmode.ext.horiz = SetBitField(hTotal,8:8,0:0)
| SetBitField(hDisplay,8:8,1:1) | SetBitField(hDisplay,8:8,1:1)
| SetBitField(hBlankStart,8:8,2:2) | SetBitField(hBlankStart,8:8,2:2)
| SetBitField(hStart,8:8,3:3); | SetBitField(hStart,8:8,3:3);
newmode.ext.extra = SetBitField(vTotal,11:11,0:0) newmode.ext.extra = SetBitField(vTotal,11:11,0:0)
| SetBitField(vDisplay,11:11,2:2) | SetBitField(vDisplay,11:11,2:2)
| SetBitField(vStart,11:11,4:4) | SetBitField(vStart,11:11,4:4)
| SetBitField(vBlankStart,11:11,6:6); | SetBitField(vBlankStart,11:11,6:6);
if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) { if ((info->var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
int tmp = (hTotal >> 1) & ~1; int tmp = (hTotal >> 1) & ~1;
newmode.ext.interlace = Set8Bits(tmp); newmode.ext.interlace = Set8Bits(tmp);
newmode.ext.horiz |= SetBitField(tmp, 8:8,4:4); newmode.ext.horiz |= SetBitField(tmp, 8:8,4:4);
} else } else
newmode.ext.interlace = 0xff; /* interlace off */ newmode.ext.interlace = 0xff; /* interlace off */
if (par->riva.Architecture >= NV_ARCH_10) if (par->riva.Architecture >= NV_ARCH_10)
...@@ -774,7 +774,7 @@ static int riva_load_video_mode(struct fb_info *info) ...@@ -774,7 +774,7 @@ static int riva_load_video_mode(struct fb_info *info)
if (info->var.sync & FB_SYNC_VERT_HIGH_ACT) if (info->var.sync & FB_SYNC_VERT_HIGH_ACT)
newmode.misc_output &= ~0x80; newmode.misc_output &= ~0x80;
else else
newmode.misc_output |= 0x80; newmode.misc_output |= 0x80;
rc = CalcStateExt(&par->riva, &newmode.ext, par->pdev, bpp, width, rc = CalcStateExt(&par->riva, &newmode.ext, par->pdev, bpp, width,
hDisplaySize, height, dotClock); hDisplaySize, height, dotClock);
...@@ -841,7 +841,7 @@ static void riva_update_var(struct fb_var_screeninfo *var, ...@@ -841,7 +841,7 @@ static void riva_update_var(struct fb_var_screeninfo *var,
} }
/** /**
* rivafb_do_maximize - * rivafb_do_maximize -
* @info: pointer to fb_info object containing info for current riva board * @info: pointer to fb_info object containing info for current riva board
* @var: standard kernel fb changeable data * @var: standard kernel fb changeable data
* @nom: nom * @nom: nom
...@@ -852,7 +852,7 @@ static void riva_update_var(struct fb_var_screeninfo *var, ...@@ -852,7 +852,7 @@ static void riva_update_var(struct fb_var_screeninfo *var,
* *
* RETURNS: * RETURNS:
* -EINVAL on failure, 0 on success * -EINVAL on failure, 0 on success
* *
* *
* CALLED FROM: * CALLED FROM:
* rivafb_check_var() * rivafb_check_var()
...@@ -916,14 +916,14 @@ static int rivafb_do_maximize(struct fb_info *info, ...@@ -916,14 +916,14 @@ static int rivafb_do_maximize(struct fb_info *info,
return -EINVAL; return -EINVAL;
} }
} }
if (var->xres_virtual * nom / den >= 8192) { if (var->xres_virtual * nom / den >= 8192) {
printk(KERN_WARNING PFX printk(KERN_WARNING PFX
"virtual X resolution (%d) is too high, lowering to %d\n", "virtual X resolution (%d) is too high, lowering to %d\n",
var->xres_virtual, 8192 * den / nom - 16); var->xres_virtual, 8192 * den / nom - 16);
var->xres_virtual = 8192 * den / nom - 16; var->xres_virtual = 8192 * den / nom - 16;
} }
if (var->xres_virtual < var->xres) { if (var->xres_virtual < var->xres) {
printk(KERN_ERR PFX printk(KERN_ERR PFX
"virtual X resolution (%d) is smaller than real\n", var->xres_virtual); "virtual X resolution (%d) is smaller than real\n", var->xres_virtual);
...@@ -1010,7 +1010,7 @@ static int riva_get_cmap_len(const struct fb_var_screeninfo *var) ...@@ -1010,7 +1010,7 @@ static int riva_get_cmap_len(const struct fb_var_screeninfo *var)
break; break;
case 6: case 6:
rc = 64; /* 64 entries (2^6), 16 bpp, RGB565 */ rc = 64; /* 64 entries (2^6), 16 bpp, RGB565 */
break; break;
default: default:
/* should not occur */ /* should not occur */
break; break;
...@@ -1042,7 +1042,7 @@ static int rivafb_open(struct fb_info *info, int user) ...@@ -1042,7 +1042,7 @@ static int rivafb_open(struct fb_info *info, int user)
/* vgaHWunlock() + riva unlock (0x7F) */ /* vgaHWunlock() + riva unlock (0x7F) */
CRTCout(par, 0x11, 0xFF); CRTCout(par, 0x11, 0xFF);
par->riva.LockUnlock(&par->riva, 0); par->riva.LockUnlock(&par->riva, 0);
riva_save_state(par, &par->initial_state); riva_save_state(par, &par->initial_state);
} }
par->ref_count++; par->ref_count++;
...@@ -1082,7 +1082,7 @@ static int rivafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -1082,7 +1082,7 @@ static int rivafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
struct riva_par *par = info->par; struct riva_par *par = info->par;
int nom, den; /* translating from pixels->bytes */ int nom, den; /* translating from pixels->bytes */
int mode_valid = 0; int mode_valid = 0;
NVTRACE_ENTER(); NVTRACE_ENTER();
if (!var->pixclock) if (!var->pixclock)
return -EINVAL; return -EINVAL;
...@@ -1176,7 +1176,7 @@ static int rivafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) ...@@ -1176,7 +1176,7 @@ static int rivafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
if (var->yoffset > var->yres_virtual - var->yres) if (var->yoffset > var->yres_virtual - var->yres)
var->yoffset = var->yres_virtual - var->yres - 1; var->yoffset = var->yres_virtual - var->yres - 1;
var->red.msb_right = var->red.msb_right =
var->green.msb_right = var->green.msb_right =
var->blue.msb_right = var->blue.msb_right =
var->transp.offset = var->transp.length = var->transp.msb_right = 0; var->transp.offset = var->transp.length = var->transp.msb_right = 0;
...@@ -1198,7 +1198,7 @@ static int rivafb_set_par(struct fb_info *info) ...@@ -1198,7 +1198,7 @@ static int rivafb_set_par(struct fb_info *info)
goto out; goto out;
if(!(info->flags & FBINFO_HWACCEL_DISABLED)) if(!(info->flags & FBINFO_HWACCEL_DISABLED))
riva_setup_accel(info); riva_setup_accel(info);
par->cursor_reset = 1; par->cursor_reset = 1;
info->fix.line_length = (info->var.xres_virtual * (info->var.bits_per_pixel >> 3)); info->fix.line_length = (info->var.xres_virtual * (info->var.bits_per_pixel >> 3));
info->fix.visual = (info->var.bits_per_pixel == 8) ? info->fix.visual = (info->var.bits_per_pixel == 8) ?
...@@ -1486,7 +1486,7 @@ static inline void convert_bgcolor_16(u32 *col) ...@@ -1486,7 +1486,7 @@ static inline void convert_bgcolor_16(u32 *col)
* CALLED FROM: * CALLED FROM:
* framebuffer hook * framebuffer hook
*/ */
static void rivafb_imageblit(struct fb_info *info, static void rivafb_imageblit(struct fb_info *info,
const struct fb_image *image) const struct fb_image *image)
{ {
struct riva_par *par = info->par; struct riva_par *par = info->par;
...@@ -1515,7 +1515,7 @@ static void rivafb_imageblit(struct fb_info *info, ...@@ -1515,7 +1515,7 @@ static void rivafb_imageblit(struct fb_info *info,
bgx = par->palette[image->bg_color]; bgx = par->palette[image->bg_color];
} }
if (info->var.green.length == 6) if (info->var.green.length == 6)
convert_bgcolor_16(&bgx); convert_bgcolor_16(&bgx);
break; break;
} }
...@@ -1612,7 +1612,7 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor) ...@@ -1612,7 +1612,7 @@ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
u8 *dat = (u8 *) cursor->image.data; u8 *dat = (u8 *) cursor->image.data;
u8 *msk = (u8 *) cursor->mask; u8 *msk = (u8 *) cursor->mask;
u8 *src; u8 *src;
src = kmalloc_array(s_pitch, cursor->image.height, GFP_ATOMIC); src = kmalloc_array(s_pitch, cursor->image.height, GFP_ATOMIC);
if (src) { if (src) {
...@@ -1683,7 +1683,7 @@ static const struct fb_ops riva_fb_ops = { ...@@ -1683,7 +1683,7 @@ static const struct fb_ops riva_fb_ops = {
.fb_fillrect = rivafb_fillrect, .fb_fillrect = rivafb_fillrect,
.fb_copyarea = rivafb_copyarea, .fb_copyarea = rivafb_copyarea,
.fb_imageblit = rivafb_imageblit, .fb_imageblit = rivafb_imageblit,
.fb_cursor = rivafb_cursor, .fb_cursor = rivafb_cursor,
.fb_sync = rivafb_sync, .fb_sync = rivafb_sync,
}; };
...@@ -1713,7 +1713,7 @@ static int riva_set_fbinfo(struct fb_info *info) ...@@ -1713,7 +1713,7 @@ static int riva_set_fbinfo(struct fb_info *info)
info->pseudo_palette = par->pseudo_palette; info->pseudo_palette = par->pseudo_palette;
cmap_len = riva_get_cmap_len(&info->var); cmap_len = riva_get_cmap_len(&info->var);
fb_alloc_cmap(&info->cmap, cmap_len, 0); fb_alloc_cmap(&info->cmap, cmap_len, 0);
info->pixmap.size = 8 * 1024; info->pixmap.size = 8 * 1024;
info->pixmap.buf_align = 4; info->pixmap.buf_align = 4;
...@@ -1929,7 +1929,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) ...@@ -1929,7 +1929,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
default_par->Chipset = (pd->vendor << 16) | pd->device; default_par->Chipset = (pd->vendor << 16) | pd->device;
printk(KERN_INFO PFX "nVidia device/chipset %X\n",default_par->Chipset); printk(KERN_INFO PFX "nVidia device/chipset %X\n",default_par->Chipset);
if(default_par->riva.Architecture == 0) { if(default_par->riva.Architecture == 0) {
printk(KERN_ERR PFX "unknown NV_ARCH\n"); printk(KERN_ERR PFX "unknown NV_ARCH\n");
ret=-ENODEV; ret=-ENODEV;
...@@ -1947,7 +1947,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) ...@@ -1947,7 +1947,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
if (flatpanel == 1) if (flatpanel == 1)
printk(KERN_INFO PFX "flatpanel support enabled\n"); printk(KERN_INFO PFX "flatpanel support enabled\n");
default_par->forceCRTC = forceCRTC; default_par->forceCRTC = forceCRTC;
rivafb_fix.mmio_len = pci_resource_len(pd, 0); rivafb_fix.mmio_len = pci_resource_len(pd, 0);
rivafb_fix.smem_len = pci_resource_len(pd, 1); rivafb_fix.smem_len = pci_resource_len(pd, 1);
...@@ -1959,7 +1959,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) ...@@ -1959,7 +1959,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
cmd |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY); cmd |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
pci_write_config_word(pd, PCI_COMMAND, cmd); pci_write_config_word(pd, PCI_COMMAND, cmd);
} }
rivafb_fix.mmio_start = pci_resource_start(pd, 0); rivafb_fix.mmio_start = pci_resource_start(pd, 0);
rivafb_fix.smem_start = pci_resource_start(pd, 1); rivafb_fix.smem_start = pci_resource_start(pd, 1);
...@@ -2058,7 +2058,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent) ...@@ -2058,7 +2058,7 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
#endif #endif
iounmap(info->screen_base); iounmap(info->screen_base);
err_iounmap_pramin: err_iounmap_pramin:
if (default_par->riva.Architecture == NV_ARCH_03) if (default_par->riva.Architecture == NV_ARCH_03)
iounmap(default_par->riva.PRAMIN); iounmap(default_par->riva.PRAMIN);
err_iounmap_ctrl_base: err_iounmap_ctrl_base:
iounmap(default_par->ctrl_base); iounmap(default_par->ctrl_base);
...@@ -2077,7 +2077,7 @@ static void rivafb_remove(struct pci_dev *pd) ...@@ -2077,7 +2077,7 @@ static void rivafb_remove(struct pci_dev *pd)
{ {
struct fb_info *info = pci_get_drvdata(pd); struct fb_info *info = pci_get_drvdata(pd);
struct riva_par *par = info->par; struct riva_par *par = info->par;
NVTRACE_ENTER(); NVTRACE_ENTER();
#ifdef CONFIG_FB_RIVA_I2C #ifdef CONFIG_FB_RIVA_I2C
...@@ -2117,11 +2117,11 @@ static int rivafb_setup(char *options) ...@@ -2117,11 +2117,11 @@ static int rivafb_setup(char *options)
while ((this_opt = strsep(&options, ",")) != NULL) { while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "forceCRTC", 9)) { if (!strncmp(this_opt, "forceCRTC", 9)) {
char *p; char *p;
p = this_opt + 9; p = this_opt + 9;
if (!*p || !*(++p)) continue; if (!*p || !*(++p)) continue;
forceCRTC = *p - '0'; forceCRTC = *p - '0';
if (forceCRTC < 0 || forceCRTC > 1) if (forceCRTC < 0 || forceCRTC > 1)
forceCRTC = -1; forceCRTC = -1;
} else if (!strncmp(this_opt, "flatpanel", 9)) { } else if (!strncmp(this_opt, "flatpanel", 9)) {
flatpanel = 1; flatpanel = 1;
......
This diff is collapsed.
...@@ -364,7 +364,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var, ...@@ -364,7 +364,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
return -EINVAL; return -EINVAL;
} }
var->pixclock = KHZ2PICOS(freq); var->pixclock = KHZ2PICOS(freq);
if (var->vmode & FB_VMODE_INTERLACED) if (var->vmode & FB_VMODE_INTERLACED)
vBackPorch += (vBackPorch % 2); vBackPorch += (vBackPorch % 2);
if (var->vmode & FB_VMODE_DOUBLE) { if (var->vmode & FB_VMODE_DOUBLE) {
...@@ -382,7 +382,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var, ...@@ -382,7 +382,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
printk(KERN_ERR "sstfb: Unsupported bpp %d\n", var->bits_per_pixel); printk(KERN_ERR "sstfb: Unsupported bpp %d\n", var->bits_per_pixel);
return -EINVAL; return -EINVAL;
} }
/* validity tests */ /* validity tests */
if (var->xres <= 1 || yDim <= 0 || var->hsync_len <= 1 || if (var->xres <= 1 || yDim <= 0 || var->hsync_len <= 1 ||
hSyncOff <= 1 || var->left_margin <= 2 || vSyncOn <= 0 || hSyncOff <= 1 || var->left_margin <= 2 || vSyncOn <= 0 ||
...@@ -392,7 +392,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var, ...@@ -392,7 +392,7 @@ static int sstfb_check_var(struct fb_var_screeninfo *var,
if (IS_VOODOO2(par)) { if (IS_VOODOO2(par)) {
/* Voodoo 2 limits */ /* Voodoo 2 limits */
tiles_in_X = (var->xres + 63 ) / 64 * 2; tiles_in_X = (var->xres + 63 ) / 64 * 2;
if (var->xres > POW2(11) || yDim >= POW2(11)) { if (var->xres > POW2(11) || yDim >= POW2(11)) {
printk(KERN_ERR "sstfb: Unsupported resolution %dx%d\n", printk(KERN_ERR "sstfb: Unsupported resolution %dx%d\n",
...@@ -631,7 +631,7 @@ static int sstfb_set_par(struct fb_info *info) ...@@ -631,7 +631,7 @@ static int sstfb_set_par(struct fb_info *info)
lfbmode |= ( LFB_WORD_SWIZZLE_WR | LFB_BYTE_SWIZZLE_WR | lfbmode |= ( LFB_WORD_SWIZZLE_WR | LFB_BYTE_SWIZZLE_WR |
LFB_WORD_SWIZZLE_RD | LFB_BYTE_SWIZZLE_RD ); LFB_WORD_SWIZZLE_RD | LFB_BYTE_SWIZZLE_RD );
#endif #endif
if (clipping) { if (clipping) {
sst_write(LFBMODE, lfbmode | EN_PXL_PIPELINE); sst_write(LFBMODE, lfbmode | EN_PXL_PIPELINE);
/* /*
...@@ -684,7 +684,7 @@ static int sstfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, ...@@ -684,7 +684,7 @@ static int sstfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
| (green << info->var.green.offset) | (green << info->var.green.offset)
| (blue << info->var.blue.offset) | (blue << info->var.blue.offset)
| (transp << info->var.transp.offset); | (transp << info->var.transp.offset);
par->palette[regno] = col; par->palette[regno] = col;
return 0; return 0;
...@@ -773,7 +773,7 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) ...@@ -773,7 +773,7 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{ {
struct sstfb_par *par = info->par; struct sstfb_par *par = info->par;
u32 stride = info->fix.line_length; u32 stride = info->fix.line_length;
if (!IS_VOODOO2(par)) if (!IS_VOODOO2(par))
return; return;
...@@ -795,17 +795,17 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) ...@@ -795,17 +795,17 @@ static void sstfb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
* FillRect 2D command (solidfill or invert (via ROP_XOR)) - Voodoo2 only * FillRect 2D command (solidfill or invert (via ROP_XOR)) - Voodoo2 only
*/ */
#if 0 #if 0
static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
{ {
struct sstfb_par *par = info->par; struct sstfb_par *par = info->par;
u32 stride = info->fix.line_length; u32 stride = info->fix.line_length;
if (!IS_VOODOO2(par)) if (!IS_VOODOO2(par))
return; return;
sst_write(BLTCLIPX, info->var.xres); sst_write(BLTCLIPX, info->var.xres);
sst_write(BLTCLIPY, info->var.yres); sst_write(BLTCLIPY, info->var.yres);
sst_write(BLTDSTBASEADDR, 0); sst_write(BLTDSTBASEADDR, 0);
sst_write(BLTCOLOR, rect->color); sst_write(BLTCOLOR, rect->color);
sst_write(BLTROP, rect->rop == ROP_COPY ? BLTROP_COPY : BLTROP_XOR); sst_write(BLTROP, rect->rop == ROP_COPY ? BLTROP_COPY : BLTROP_XOR);
...@@ -820,8 +820,8 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) ...@@ -820,8 +820,8 @@ static void sstfb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
/* /*
* get lfb size * get lfb size
*/ */
static int sst_get_memsize(struct fb_info *info, __u32 *memsize) static int sst_get_memsize(struct fb_info *info, __u32 *memsize)
{ {
...@@ -859,8 +859,8 @@ static int sst_get_memsize(struct fb_info *info, __u32 *memsize) ...@@ -859,8 +859,8 @@ static int sst_get_memsize(struct fb_info *info, __u32 *memsize)
} }
/* /*
* DAC detection routines * DAC detection routines
*/ */
/* fbi should be idle, and fifo emty and mem disabled */ /* fbi should be idle, and fifo emty and mem disabled */
...@@ -963,7 +963,7 @@ static int sst_detect_ics(struct fb_info *info) ...@@ -963,7 +963,7 @@ static int sst_detect_ics(struct fb_info *info)
* see detect_dac * see detect_dac
*/ */
static int sst_set_pll_att_ti(struct fb_info *info, static int sst_set_pll_att_ti(struct fb_info *info,
const struct pll_timing *t, const int clock) const struct pll_timing *t, const int clock)
{ {
struct sstfb_par *par = info->par; struct sstfb_par *par = info->par;
...@@ -1338,10 +1338,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1338,10 +1338,10 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return -ENOMEM; return -ENOMEM;
pci_set_drvdata(pdev, info); pci_set_drvdata(pdev, info);
par = info->par; par = info->par;
fix = &info->fix; fix = &info->fix;
par->type = id->driver_data; par->type = id->driver_data;
spec = &voodoo_spec[par->type]; spec = &voodoo_spec[par->type];
f_ddprintk("found device : %s\n", spec->name); f_ddprintk("found device : %s\n", spec->name);
...@@ -1407,7 +1407,7 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1407,7 +1407,7 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
* fact dithered to 16bit). * fact dithered to 16bit).
*/ */
fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */ fix->line_length = 2048; /* default value, for 24 or 32bit: 4096 */
fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16); fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 16);
if (sstfb_check_var(&info->var, info)) { if (sstfb_check_var(&info->var, info)) {
...@@ -1419,7 +1419,7 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1419,7 +1419,7 @@ static int sstfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
printk(KERN_ERR "sstfb: can't set default video mode.\n"); printk(KERN_ERR "sstfb: can't set default video mode.\n");
goto fail; goto fail;
} }
if (fb_alloc_cmap(&info->cmap, 256, 0)) { if (fb_alloc_cmap(&info->cmap, 256, 0)) {
printk(KERN_ERR "sstfb: can't alloc cmap memory.\n"); printk(KERN_ERR "sstfb: can't alloc cmap memory.\n");
goto fail; goto fail;
...@@ -1465,7 +1465,7 @@ static void sstfb_remove(struct pci_dev *pdev) ...@@ -1465,7 +1465,7 @@ static void sstfb_remove(struct pci_dev *pdev)
info = pci_get_drvdata(pdev); info = pci_get_drvdata(pdev);
par = info->par; par = info->par;
device_remove_file(info->dev, &device_attrs[0]); device_remove_file(info->dev, &device_attrs[0]);
sst_shutdown(info); sst_shutdown(info);
iounmap(info->screen_base); iounmap(info->screen_base);
......
...@@ -729,7 +729,7 @@ tgafb_mono_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -729,7 +729,7 @@ tgafb_mono_imageblit(struct fb_info *info, const struct fb_image *image)
/* Handle another common case in which accel_putcs /* Handle another common case in which accel_putcs
generates a large bitmap, which happens to be aligned. generates a large bitmap, which happens to be aligned.
Allow the tail to be misaligned. This case is Allow the tail to be misaligned. This case is
interesting because we've not got to hold partial interesting because we've not got to hold partial
bytes across the words being written. */ bytes across the words being written. */
...@@ -908,9 +908,9 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image) ...@@ -908,9 +908,9 @@ tgafb_imageblit(struct fb_info *info, const struct fb_image *image)
} }
/** /**
* tgafb_fillrect - REQUIRED function. Can use generic routines if * tgafb_fillrect - REQUIRED function. Can use generic routines if
* non acclerated hardware and packed pixel based. * non acclerated hardware and packed pixel based.
* Draws a rectangle on the screen. * Draws a rectangle on the screen.
* *
* @info: frame buffer structure that represents a single frame buffer * @info: frame buffer structure that represents a single frame buffer
* @rect: structure defining the rectagle and operation. * @rect: structure defining the rectagle and operation.
...@@ -1044,7 +1044,7 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) ...@@ -1044,7 +1044,7 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
/* Handle the special case of copying entire lines, e.g. during scrolling. /* Handle the special case of copying entire lines, e.g. during scrolling.
We can avoid a lot of needless computation in this case. In the 8bpp We can avoid a lot of needless computation in this case. In the 8bpp
case we need to use the COPY64 registers instead of mask writes into case we need to use the COPY64 registers instead of mask writes into
the frame buffer to achieve maximum performance. */ the frame buffer to achieve maximum performance. */
static inline void static inline void
...@@ -1251,7 +1251,7 @@ copyarea_8bpp(struct fb_info *info, u32 dx, u32 dy, u32 sx, u32 sy, ...@@ -1251,7 +1251,7 @@ copyarea_8bpp(struct fb_info *info, u32 dx, u32 dy, u32 sx, u32 sy,
} }
static void static void
tgafb_copyarea(struct fb_info *info, const struct fb_copyarea *area) tgafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{ {
unsigned long dx, dy, width, height, sx, sy, vxres, vyres; unsigned long dx, dy, width, height, sx, sy, vxres, vyres;
unsigned long line_length, bpp; unsigned long line_length, bpp;
......
/* /*
* linux/drivers/video/vga16.c -- VGA 16-color framebuffer driver * linux/drivers/video/vga16.c -- VGA 16-color framebuffer driver
* *
* Copyright 1999 Ben Pfaff <pfaffben@debian.org> and Petr Vandrovec <VANDROVE@vc.cvut.cz> * Copyright 1999 Ben Pfaff <pfaffben@debian.org> and Petr Vandrovec <VANDROVE@vc.cvut.cz>
* Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm
* Based on VESA framebuffer (c) 1998 Gerd Knorr <kraxel@goldbach.in-berlin.de> * Based on VESA framebuffer (c) 1998 Gerd Knorr <kraxel@goldbach.in-berlin.de>
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
* archive for more details. * archive for more details.
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -70,7 +70,7 @@ static struct fb_var_screeninfo vga16fb_defined = { ...@@ -70,7 +70,7 @@ static struct fb_var_screeninfo vga16fb_defined = {
.yres = 480, .yres = 480,
.xres_virtual = 640, .xres_virtual = 640,
.yres_virtual = 480, .yres_virtual = 480,
.bits_per_pixel = 4, .bits_per_pixel = 4,
.activate = FB_ACTIVATE_TEST, .activate = FB_ACTIVATE_TEST,
.height = -1, .height = -1,
.width = -1, .width = -1,
...@@ -120,7 +120,7 @@ static inline void rmw(volatile char __iomem *p) ...@@ -120,7 +120,7 @@ static inline void rmw(volatile char __iomem *p)
static inline int setmode(int mode) static inline int setmode(int mode)
{ {
int oldmode; int oldmode;
oldmode = vga_io_rgfx(VGA_GFX_MODE); oldmode = vga_io_rgfx(VGA_GFX_MODE);
vga_io_w(VGA_GFX_D, mode); vga_io_w(VGA_GFX_D, mode);
return oldmode; return oldmode;
...@@ -139,19 +139,19 @@ static inline void setmask(int mask) ...@@ -139,19 +139,19 @@ static inline void setmask(int mask)
vga_io_w(VGA_GFX_D, mask); vga_io_w(VGA_GFX_D, mask);
} }
/* Set the Data Rotate Register and return its old value. /* Set the Data Rotate Register and return its old value.
Bits 0-2 are rotate count, bits 3-4 are logical operation Bits 0-2 are rotate count, bits 3-4 are logical operation
(0=NOP, 1=AND, 2=OR, 3=XOR). */ (0=NOP, 1=AND, 2=OR, 3=XOR). */
static inline int setop(int op) static inline int setop(int op)
{ {
int oldop; int oldop;
oldop = vga_io_rgfx(VGA_GFX_DATA_ROTATE); oldop = vga_io_rgfx(VGA_GFX_DATA_ROTATE);
vga_io_w(VGA_GFX_D, op); vga_io_w(VGA_GFX_D, op);
return oldop; return oldop;
} }
/* Set the Enable Set/Reset Register and return its old value. /* Set the Enable Set/Reset Register and return its old value.
The code here always uses value 0xf for this register. */ The code here always uses value 0xf for this register. */
static inline int setsr(int sr) static inline int setsr(int sr)
{ {
...@@ -203,7 +203,7 @@ static inline int check_mode_supported(void) ...@@ -203,7 +203,7 @@ static inline int check_mode_supported(void)
return 0; return 0;
} }
static void vga16fb_pan_var(struct fb_info *info, static void vga16fb_pan_var(struct fb_info *info,
struct fb_var_screeninfo *var) struct fb_var_screeninfo *var)
{ {
struct vga16fb_par *par = info->par; struct vga16fb_par *par = info->par;
...@@ -296,7 +296,7 @@ static void vga16fb_clock_chip(struct vga16fb_par *par, ...@@ -296,7 +296,7 @@ static void vga16fb_clock_chip(struct vga16fb_par *par,
par->clkdiv = best->seq_clock_mode; par->clkdiv = best->seq_clock_mode;
*pixclock = (best->pixclock * div) / mul; *pixclock = (best->pixclock * div) / mul;
} }
#define FAIL(X) return -EINVAL #define FAIL(X) return -EINVAL
static int vga16fb_open(struct fb_info *info, int user) static int vga16fb_open(struct fb_info *info, int user)
...@@ -511,7 +511,7 @@ static int vga16fb_check_var(struct fb_var_screeninfo *var, ...@@ -511,7 +511,7 @@ static int vga16fb_check_var(struct fb_var_screeninfo *var,
par->misc &= ~0x40; par->misc &= ~0x40;
if (var->sync & FB_SYNC_VERT_HIGH_ACT) if (var->sync & FB_SYNC_VERT_HIGH_ACT)
par->misc &= ~0x80; par->misc &= ~0x80;
par->mode = mode; par->mode = mode;
if (mode & MODE_8BPP) if (mode & MODE_8BPP)
...@@ -520,8 +520,8 @@ static int vga16fb_check_var(struct fb_var_screeninfo *var, ...@@ -520,8 +520,8 @@ static int vga16fb_check_var(struct fb_var_screeninfo *var,
else else
/* pixel clock == vga clock */ /* pixel clock == vga clock */
vga16fb_clock_chip(par, &var->pixclock, info, 1, 1); vga16fb_clock_chip(par, &var->pixclock, info, 1, 1);
var->red.offset = var->green.offset = var->blue.offset = var->red.offset = var->green.offset = var->blue.offset =
var->transp.offset = 0; var->transp.offset = 0;
var->red.length = var->green.length = var->blue.length = var->red.length = var->green.length = var->blue.length =
(par->isVGA) ? 6 : 2; (par->isVGA) ? 6 : 2;
...@@ -588,10 +588,10 @@ static int vga16fb_set_par(struct fb_info *info) ...@@ -588,10 +588,10 @@ static int vga16fb_set_par(struct fb_info *info)
else else
atc[VGA_ATC_PEL] = info->var.xoffset & 7; atc[VGA_ATC_PEL] = info->var.xoffset & 7;
atc[VGA_ATC_COLOR_PAGE] = 0x00; atc[VGA_ATC_COLOR_PAGE] = 0x00;
if (par->mode & MODE_TEXT) { if (par->mode & MODE_TEXT) {
fh = 16; // FIXME !!! Fudge font height. fh = 16; // FIXME !!! Fudge font height.
par->crtc[VGA_CRTC_MAX_SCAN] = (par->crtc[VGA_CRTC_MAX_SCAN] par->crtc[VGA_CRTC_MAX_SCAN] = (par->crtc[VGA_CRTC_MAX_SCAN]
& ~0x1F) | (fh - 1); & ~0x1F) | (fh - 1);
} }
...@@ -602,10 +602,10 @@ static int vga16fb_set_par(struct fb_info *info) ...@@ -602,10 +602,10 @@ static int vga16fb_set_par(struct fb_info *info)
vga_io_w(EGA_GFX_E0, 0x00); vga_io_w(EGA_GFX_E0, 0x00);
vga_io_w(EGA_GFX_E1, 0x01); vga_io_w(EGA_GFX_E1, 0x01);
} }
/* update misc output register */ /* update misc output register */
vga_io_w(VGA_MIS_W, par->misc); vga_io_w(VGA_MIS_W, par->misc);
/* synchronous reset on */ /* synchronous reset on */
vga_io_wseq(0x00, 0x01); vga_io_wseq(0x00, 0x01);
...@@ -617,7 +617,7 @@ static int vga16fb_set_par(struct fb_info *info) ...@@ -617,7 +617,7 @@ static int vga16fb_set_par(struct fb_info *info)
for (i = 2; i < VGA_SEQ_C; i++) { for (i = 2; i < VGA_SEQ_C; i++) {
vga_io_wseq(i, seq[i]); vga_io_wseq(i, seq[i]);
} }
/* synchronous reset off */ /* synchronous reset off */
vga_io_wseq(0x00, 0x03); vga_io_wseq(0x00, 0x03);
...@@ -628,12 +628,12 @@ static int vga16fb_set_par(struct fb_info *info) ...@@ -628,12 +628,12 @@ static int vga16fb_set_par(struct fb_info *info)
for (i = 0; i < VGA_CRTC_REGS; i++) { for (i = 0; i < VGA_CRTC_REGS; i++) {
vga_io_wcrt(i, par->crtc[i]); vga_io_wcrt(i, par->crtc[i]);
} }
/* write graphics controller registers */ /* write graphics controller registers */
for (i = 0; i < VGA_GFX_C; i++) { for (i = 0; i < VGA_GFX_C; i++) {
vga_io_wgfx(i, gdc[i]); vga_io_wgfx(i, gdc[i]);
} }
/* write attribute controller registers */ /* write attribute controller registers */
for (i = 0; i < VGA_ATT_C; i++) { for (i = 0; i < VGA_ATT_C; i++) {
vga_io_r(VGA_IS1_RC); /* reset flip-flop */ vga_io_r(VGA_IS1_RC); /* reset flip-flop */
...@@ -656,7 +656,7 @@ static void ega16_setpalette(int regno, unsigned red, unsigned green, unsigned b ...@@ -656,7 +656,7 @@ static void ega16_setpalette(int regno, unsigned red, unsigned green, unsigned b
{ {
static const unsigned char map[] = { 000, 001, 010, 011 }; static const unsigned char map[] = { 000, 001, 010, 011 };
int val; int val;
if (regno >= 16) if (regno >= 16)
return; return;
val = map[red>>14] | ((map[green>>14]) << 1) | ((map[blue>>14]) << 2); val = map[red>>14] | ((map[green>>14]) << 1) | ((map[blue>>14]) << 2);
...@@ -687,17 +687,17 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -687,17 +687,17 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green,
* (according to the entries in the `var' structure). Return * (according to the entries in the `var' structure). Return
* != 0 for invalid regno. * != 0 for invalid regno.
*/ */
if (regno >= 256) if (regno >= 256)
return 1; return 1;
gray = info->var.grayscale; gray = info->var.grayscale;
if (gray) { if (gray) {
/* gray = 0.30*R + 0.59*G + 0.11*B */ /* gray = 0.30*R + 0.59*G + 0.11*B */
red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8; red = green = blue = (red * 77 + green * 151 + blue * 28) >> 8;
} }
if (par->isVGA) if (par->isVGA)
vga16_setpalette(regno,red,green,blue); vga16_setpalette(regno,red,green,blue);
else else
ega16_setpalette(regno,red,green,blue); ega16_setpalette(regno,red,green,blue);
...@@ -705,7 +705,7 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green, ...@@ -705,7 +705,7 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green,
} }
static int vga16fb_pan_display(struct fb_var_screeninfo *var, static int vga16fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
vga16fb_pan_var(info, var); vga16fb_pan_var(info, var);
return 0; return 0;
...@@ -720,7 +720,7 @@ static void vga_vesa_blank(struct vga16fb_par *par, int mode) ...@@ -720,7 +720,7 @@ static void vga_vesa_blank(struct vga16fb_par *par, int mode)
{ {
unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I); unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I);
unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC); unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC);
/* save original values of VGA controller registers */ /* save original values of VGA controller registers */
if(!par->vesa_blanked) { if(!par->vesa_blanked) {
par->vga_state.CrtMiscIO = vga_io_r(VGA_MIS_R); par->vga_state.CrtMiscIO = vga_io_r(VGA_MIS_R);
...@@ -776,7 +776,7 @@ static void vga_vesa_unblank(struct vga16fb_par *par) ...@@ -776,7 +776,7 @@ static void vga_vesa_unblank(struct vga16fb_par *par)
{ {
unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I); unsigned char SeqCtrlIndex = vga_io_r(VGA_SEQ_I);
unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC); unsigned char CrtCtrlIndex = vga_io_r(VGA_CRT_IC);
/* restore original values of VGA controller registers */ /* restore original values of VGA controller registers */
vga_io_w(VGA_MIS_W, par->vga_state.CrtMiscIO); vga_io_w(VGA_MIS_W, par->vga_state.CrtMiscIO);
...@@ -962,7 +962,7 @@ static void vga16fb_fillrect(struct fb_info *info, const struct fb_fillrect *rec ...@@ -962,7 +962,7 @@ static void vga16fb_fillrect(struct fb_info *info, const struct fb_fillrect *rec
} }
break; break;
} }
} else } else
vga_8planes_fillrect(info, rect); vga_8planes_fillrect(info, rect);
break; break;
case FB_TYPE_PACKED_PIXELS: case FB_TYPE_PACKED_PIXELS:
...@@ -1029,7 +1029,7 @@ static void vga_8planes_copyarea(struct fb_info *info, const struct fb_copyarea ...@@ -1029,7 +1029,7 @@ static void vga_8planes_copyarea(struct fb_info *info, const struct fb_copyarea
static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *area) static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
{ {
u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy; u32 dx = area->dx, dy = area->dy, sx = area->sx, sy = area->sy;
int x, x2, y2, old_dx, old_dy, vxres, vyres; int x, x2, y2, old_dx, old_dy, vxres, vyres;
int height, width, line_ofs; int height, width, line_ofs;
char __iomem *dst = NULL; char __iomem *dst = NULL;
...@@ -1094,9 +1094,9 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are ...@@ -1094,9 +1094,9 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
dst += line_ofs; dst += line_ofs;
} }
} else { } else {
dst = info->screen_base + (dx/8) + width + dst = info->screen_base + (dx/8) + width +
(dy + height - 1) * info->fix.line_length; (dy + height - 1) * info->fix.line_length;
src = info->screen_base + (sx/8) + width + src = info->screen_base + (sx/8) + width +
(sy + height - 1) * info->fix.line_length; (sy + height - 1) * info->fix.line_length;
while (height--) { while (height--) {
for (x = 0; x < width; x++) { for (x = 0; x < width; x++) {
...@@ -1109,7 +1109,7 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are ...@@ -1109,7 +1109,7 @@ static void vga16fb_copyarea(struct fb_info *info, const struct fb_copyarea *are
dst -= line_ofs; dst -= line_ofs;
} }
} }
} else } else
vga_8planes_copyarea(info, area); vga_8planes_copyarea(info, area);
break; break;
case FB_TYPE_PACKED_PIXELS: case FB_TYPE_PACKED_PIXELS:
...@@ -1182,7 +1182,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im ...@@ -1182,7 +1182,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im
setsr(0xf); setsr(0xf);
setcolor(image->fg_color); setcolor(image->fg_color);
selectmask(); selectmask();
setmask(0xff); setmask(0xff);
writeb(image->bg_color, where); writeb(image->bg_color, where);
rmb(); rmb();
...@@ -1191,7 +1191,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im ...@@ -1191,7 +1191,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im
wmb(); wmb();
for (y = 0; y < image->height; y++) { for (y = 0; y < image->height; y++) {
dst = where; dst = where;
for (x = image->width/8; x--;) for (x = image->width/8; x--;)
writeb(*cdat++, dst++); writeb(*cdat++, dst++);
where += info->fix.line_length; where += info->fix.line_length;
} }
...@@ -1202,7 +1202,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im ...@@ -1202,7 +1202,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im
setsr(0xf); setsr(0xf);
setcolor(image->bg_color); setcolor(image->bg_color);
selectmask(); selectmask();
setmask(0xff); setmask(0xff);
for (y = 0; y < image->height; y++) { for (y = 0; y < image->height; y++) {
dst = where; dst = where;
...@@ -1218,7 +1218,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im ...@@ -1218,7 +1218,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im
where += info->fix.line_length; where += info->fix.line_length;
} }
} }
} else } else
vga_8planes_imageblit(info, image); vga_8planes_imageblit(info, image);
break; break;
case FB_TYPE_PACKED_PIXELS: case FB_TYPE_PACKED_PIXELS:
...@@ -1231,7 +1231,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im ...@@ -1231,7 +1231,7 @@ static void vga_imageblit_expand(struct fb_info *info, const struct fb_image *im
static void vga_imageblit_color(struct fb_info *info, const struct fb_image *image) static void vga_imageblit_color(struct fb_info *info, const struct fb_image *image)
{ {
/* /*
* Draw logo * Draw logo
*/ */
struct vga16fb_par *par = info->par; struct vga16fb_par *par = info->par;
char __iomem *where = char __iomem *where =
...@@ -1248,7 +1248,7 @@ static void vga_imageblit_color(struct fb_info *info, const struct fb_image *ima ...@@ -1248,7 +1248,7 @@ static void vga_imageblit_color(struct fb_info *info, const struct fb_image *ima
setsr(0xf); setsr(0xf);
setop(0); setop(0);
setmode(0); setmode(0);
for (y = 0; y < image->height; y++) { for (y = 0; y < image->height; y++) {
for (x = 0; x < image->width; x++) { for (x = 0; x < image->width; x++) {
dst = where + x/8; dst = where + x/8;
...@@ -1272,7 +1272,7 @@ static void vga_imageblit_color(struct fb_info *info, const struct fb_image *ima ...@@ -1272,7 +1272,7 @@ static void vga_imageblit_color(struct fb_info *info, const struct fb_image *ima
break; break;
} }
} }
static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image) static void vga16fb_imageblit(struct fb_info *info, const struct fb_image *image)
{ {
if (image->depth == 1) if (image->depth == 1)
...@@ -1308,10 +1308,10 @@ static const struct fb_ops vga16fb_ops = { ...@@ -1308,10 +1308,10 @@ static const struct fb_ops vga16fb_ops = {
static int __init vga16fb_setup(char *options) static int __init vga16fb_setup(char *options)
{ {
char *this_opt; char *this_opt;
if (!options || !*options) if (!options || !*options)
return 0; return 0;
while ((this_opt = strsep(&options, ",")) != NULL) { while ((this_opt = strsep(&options, ",")) != NULL) {
if (!*this_opt) continue; if (!*this_opt) continue;
} }
...@@ -1361,10 +1361,10 @@ static int vga16fb_probe(struct platform_device *dev) ...@@ -1361,10 +1361,10 @@ static int vga16fb_probe(struct platform_device *dev)
par->vesa_blanked = 0; par->vesa_blanked = 0;
i = par->isVGA? 6 : 2; i = par->isVGA? 6 : 2;
vga16fb_defined.red.length = i; vga16fb_defined.red.length = i;
vga16fb_defined.green.length = i; vga16fb_defined.green.length = i;
vga16fb_defined.blue.length = i; vga16fb_defined.blue.length = i;
/* name should not depend on EGA/VGA */ /* name should not depend on EGA/VGA */
info->fbops = &vga16fb_ops; info->fbops = &vga16fb_ops;
......
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
* linux/include/video/vga.h -- standard VGA chipset interaction * linux/include/video/vga.h -- standard VGA chipset interaction
* *
* Copyright 1999 Jeff Garzik <jgarzik@pobox.com> * Copyright 1999 Jeff Garzik <jgarzik@pobox.com>
* *
* Copyright history from vga16fb.c: * Copyright history from vga16fb.c:
* Copyright 1999 Ben Pfaff and Petr Vandrovec * Copyright 1999 Ben Pfaff and Petr Vandrovec
* Based on VGA info at http://www.osdever.net/FreeVGA/home.htm * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm
* Based on VESA framebuffer (c) 1998 Gerd Knorr * Based on VESA framebuffer (c) 1998 Gerd Knorr
* *
* This file is subject to the terms and conditions of the GNU General * This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this * Public License. See the file COPYING in the main directory of this
* archive for more details. * archive for more details.
* *
*/ */
...@@ -190,7 +190,7 @@ struct vgastate { ...@@ -190,7 +190,7 @@ struct vgastate {
__u32 num_gfx; /* number of gfx registers, 0 for default */ __u32 num_gfx; /* number of gfx registers, 0 for default */
__u32 num_seq; /* number of seq registers, 0 for default */ __u32 num_seq; /* number of seq registers, 0 for default */
void *vidstate; void *vidstate;
}; };
extern int save_vga(struct vgastate *state); extern int save_vga(struct vgastate *state);
extern int restore_vga(struct vgastate *state); extern int restore_vga(struct vgastate *state);
...@@ -198,7 +198,7 @@ extern int restore_vga(struct vgastate *state); ...@@ -198,7 +198,7 @@ extern int restore_vga(struct vgastate *state);
/* /*
* generic VGA port read/write * generic VGA port read/write
*/ */
static inline unsigned char vga_io_r (unsigned short port) static inline unsigned char vga_io_r (unsigned short port)
{ {
return inb_p(port); return inb_p(port);
...@@ -261,7 +261,7 @@ static inline void vga_w_fast (void __iomem *regbase, unsigned short port, ...@@ -261,7 +261,7 @@ static inline void vga_w_fast (void __iomem *regbase, unsigned short port,
/* /*
* VGA CRTC register read/write * VGA CRTC register read/write
*/ */
static inline unsigned char vga_rcrt (void __iomem *regbase, unsigned char reg) static inline unsigned char vga_rcrt (void __iomem *regbase, unsigned char reg)
{ {
vga_w (regbase, VGA_CRT_IC, reg); vga_w (regbase, VGA_CRT_IC, reg);
...@@ -314,7 +314,7 @@ static inline void vga_mm_wcrt (void __iomem *regbase, unsigned char reg, unsign ...@@ -314,7 +314,7 @@ static inline void vga_mm_wcrt (void __iomem *regbase, unsigned char reg, unsign
/* /*
* VGA sequencer register read/write * VGA sequencer register read/write
*/ */
static inline unsigned char vga_rseq (void __iomem *regbase, unsigned char reg) static inline unsigned char vga_rseq (void __iomem *regbase, unsigned char reg)
{ {
vga_w (regbase, VGA_SEQ_I, reg); vga_w (regbase, VGA_SEQ_I, reg);
...@@ -366,7 +366,7 @@ static inline void vga_mm_wseq (void __iomem *regbase, unsigned char reg, unsign ...@@ -366,7 +366,7 @@ static inline void vga_mm_wseq (void __iomem *regbase, unsigned char reg, unsign
/* /*
* VGA graphics controller register read/write * VGA graphics controller register read/write
*/ */
static inline unsigned char vga_rgfx (void __iomem *regbase, unsigned char reg) static inline unsigned char vga_rgfx (void __iomem *regbase, unsigned char reg)
{ {
vga_w (regbase, VGA_GFX_I, reg); vga_w (regbase, VGA_GFX_I, reg);
...@@ -419,7 +419,7 @@ static inline void vga_mm_wgfx (void __iomem *regbase, unsigned char reg, unsign ...@@ -419,7 +419,7 @@ static inline void vga_mm_wgfx (void __iomem *regbase, unsigned char reg, unsign
/* /*
* VGA attribute controller register read/write * VGA attribute controller register read/write
*/ */
static inline unsigned char vga_rattr (void __iomem *regbase, unsigned char reg) static inline unsigned char vga_rattr (void __iomem *regbase, unsigned char reg)
{ {
vga_w (regbase, VGA_ATT_IW, reg); vga_w (regbase, VGA_ATT_IW, reg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment