lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tridentfb: convert fb_info into allocated one

Browse Source 
This patch converts fb_info structure from global variable to allocatable one.

The global default_par is moved into function variable.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
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>
This commit is contained in:
Krzysztof Helt
2008-07-23 21:30:51 -07:00
committed by Linus Torvalds
parent 306fa6f60a
commit e09ed099d0
1 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/video/tridentfb.c
View File

@@ -33,10 +33,7 @@ struct tridentfb_par {
static unsigned char eng_oper; /* engine operation... */ static unsigned char eng_oper; /* engine operation... */
static struct fb_ops tridentfb_ops; static struct fb_ops tridentfb_ops;
static struct tridentfb_par default_par;
/* FIXME:kmalloc these 3 instead */ /* FIXME:kmalloc these 3 instead */
static struct fb_info fb_info;
static u32 pseudo_pal[16]; static u32 pseudo_pal[16];
static struct fb_var_screeninfo default_var; static struct fb_var_screeninfo default_var;
@@ -1217,16 +1214,23 @@ static struct fb_ops tridentfb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static int __devinit trident_pci_probe(struct pci_dev * dev, static int __devinit trident_pci_probe(struct pci_dev *dev,
const struct pci_device_id * id) const struct pci_device_id *id)
{ {
int err; int err;
unsigned char revision; unsigned char revision;
struct fb_info *info;
struct tridentfb_par *default_par;
err = pci_enable_device(dev); err = pci_enable_device(dev);
if (err) if (err)
return err; return err;
info = framebuffer_alloc(sizeof(struct tridentfb_par), &dev->dev);
if (!info)
return -ENOMEM;
default_par = info->par;
chip_id = id->device; chip_id = id->device;
if (chip_id == CYBERBLADEi1) if (chip_id == CYBERBLADEi1)
@@ -1282,8 +1286,6 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
/* acceleration is on by default for 3D chips */ /* acceleration is on by default for 3D chips */
defaultaccel = chip3D && !noaccel; defaultaccel = chip3D && !noaccel;
fb_info.par = &default_par;
/* setup MMIO region */ /* setup MMIO region */
tridentfb_fix.mmio_start = pci_resource_start(dev, 1); tridentfb_fix.mmio_start = pci_resource_start(dev, 1);
tridentfb_fix.mmio_len = chip3D ? 0x20000 : 0x10000; tridentfb_fix.mmio_len = chip3D ? 0x20000 : 0x10000;
@@ -1293,9 +1295,10 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
return -1; return -1;
} }
default_par.io_virt = ioremap_nocache(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); default_par->io_virt = ioremap_nocache(tridentfb_fix.mmio_start,
tridentfb_fix.mmio_len);
if (!default_par.io_virt) { if (!default_par->io_virt) {
debug("ioremap failed\n"); debug("ioremap failed\n");
err = -1; err = -1;
goto out_unmap1; goto out_unmap1;
@@ -1305,46 +1308,46 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
/* setup framebuffer memory */ /* setup framebuffer memory */
tridentfb_fix.smem_start = pci_resource_start(dev, 0); tridentfb_fix.smem_start = pci_resource_start(dev, 0);
tridentfb_fix.smem_len = get_memsize(&default_par); tridentfb_fix.smem_len = get_memsize(default_par);
if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) { if (!request_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len, "tridentfb")) {
debug("request_mem_region failed!\n"); debug("request_mem_region failed!\n");
disable_mmio(fb_info.par); disable_mmio(info->par);
err = -1; err = -1;
goto out_unmap1; goto out_unmap1;
} }
fb_info.screen_base = ioremap_nocache(tridentfb_fix.smem_start, info->screen_base = ioremap_nocache(tridentfb_fix.smem_start,
tridentfb_fix.smem_len); tridentfb_fix.smem_len);
if (!fb_info.screen_base) { if (!info->screen_base) {
debug("ioremap failed\n"); debug("ioremap failed\n");
err = -1; err = -1;
goto out_unmap2; goto out_unmap2;
} }
output("%s board found\n", pci_name(dev)); output("%s board found\n", pci_name(dev));
displaytype = get_displaytype(&default_par); displaytype = get_displaytype(default_par);
if (flatpanel) if (flatpanel)
nativex = get_nativex(&default_par); nativex = get_nativex(default_par);
fb_info.fix = tridentfb_fix; info->fix = tridentfb_fix;
fb_info.fbops = &tridentfb_ops; info->fbops = &tridentfb_ops;
fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
#ifdef CONFIG_FB_TRIDENT_ACCEL #ifdef CONFIG_FB_TRIDENT_ACCEL
fb_info.flags |= FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT; info->flags |= FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;
#endif #endif
fb_info.pseudo_palette = pseudo_pal; info->pseudo_palette = pseudo_pal;
if (!fb_find_mode(&default_var, &fb_info, if (!fb_find_mode(&default_var, info,
mode_option, NULL, 0, NULL, bpp)) { mode_option, NULL, 0, NULL, bpp)) {
err = -EINVAL; err = -EINVAL;
goto out_unmap2; goto out_unmap2;
} }
err = fb_alloc_cmap(&fb_info.cmap, 256, 0); err = fb_alloc_cmap(&info->cmap, 256, 0);
if (err < 0) if (err < 0)
goto out_unmap2; goto out_unmap2;
@@ -1353,39 +1356,46 @@ static int __devinit trident_pci_probe(struct pci_dev * dev,
else else
default_var.accel_flags &= ~FB_ACCELF_TEXT; default_var.accel_flags &= ~FB_ACCELF_TEXT;
default_var.activate |= FB_ACTIVATE_NOW; default_var.activate |= FB_ACTIVATE_NOW;
fb_info.var = default_var; info->var = default_var;
fb_info.device = &dev->dev; info->device = &dev->dev;
if (register_framebuffer(&fb_info) < 0) { if (register_framebuffer(info) < 0) {
printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n"); printk(KERN_ERR "tridentfb: could not register Trident framebuffer\n");
fb_dealloc_cmap(&fb_info.cmap); fb_dealloc_cmap(&info->cmap);
err = -EINVAL; err = -EINVAL;
goto out_unmap2; goto out_unmap2;
} }
output("fb%d: %s frame buffer device %dx%d-%dbpp\n", output("fb%d: %s frame buffer device %dx%d-%dbpp\n",
fb_info.node, fb_info.fix.id, default_var.xres, info->node, info->fix.id, default_var.xres,
default_var.yres, default_var.bits_per_pixel); default_var.yres, default_var.bits_per_pixel);
pci_set_drvdata(dev, info);
return 0; return 0;
out_unmap2: out_unmap2:
if (fb_info.screen_base) if (info->screen_base)
iounmap(fb_info.screen_base); iounmap(info->screen_base);
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len); release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
disable_mmio(fb_info.par); disable_mmio(info->par);
out_unmap1: out_unmap1:
if (default_par.io_virt) if (default_par->io_virt)
iounmap(default_par.io_virt); iounmap(default_par->io_virt);
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
framebuffer_release(info);
return err; return err;
} }
static void __devexit trident_pci_remove(struct pci_dev *dev) static void __devexit trident_pci_remove(struct pci_dev *dev)
{ {
struct tridentfb_par *par = (struct tridentfb_par*)fb_info.par; struct fb_info *info = pci_get_drvdata(dev);
unregister_framebuffer(&fb_info); struct tridentfb_par *par = info->par;
unregister_framebuffer(info);
iounmap(par->io_virt); iounmap(par->io_virt);
iounmap(fb_info.screen_base); iounmap(info->screen_base);
release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len); release_mem_region(tridentfb_fix.smem_start, tridentfb_fix.smem_len);
release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len); release_mem_region(tridentfb_fix.mmio_start, tridentfb_fix.mmio_len);
pci_set_drvdata(dev, NULL);
framebuffer_release(info);
} }
/* List of boards that we are trying to support */ /* List of boards that we are trying to support */