mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
228 lines
4.8 KiB
C
228 lines
4.8 KiB
C
/* sunxvr1000.c: Sun XVR-1000 driver for sparc64 systems
|
|
*
|
|
* Copyright (C) 2010 David S. Miller (davem@davemloft.net)
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/fb.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of_device.h>
|
|
|
|
struct gfb_info {
|
|
struct fb_info *info;
|
|
|
|
char __iomem *fb_base;
|
|
unsigned long fb_base_phys;
|
|
|
|
struct device_node *of_node;
|
|
|
|
unsigned int width;
|
|
unsigned int height;
|
|
unsigned int depth;
|
|
unsigned int fb_size;
|
|
|
|
u32 pseudo_palette[16];
|
|
};
|
|
|
|
static int __devinit gfb_get_props(struct gfb_info *gp)
|
|
{
|
|
gp->width = of_getintprop_default(gp->of_node, "width", 0);
|
|
gp->height = of_getintprop_default(gp->of_node, "height", 0);
|
|
gp->depth = of_getintprop_default(gp->of_node, "depth", 32);
|
|
|
|
if (!gp->width || !gp->height) {
|
|
printk(KERN_ERR "gfb: Critical properties missing for %s\n",
|
|
gp->of_node->full_name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int gfb_setcolreg(unsigned regno,
|
|
unsigned red, unsigned green, unsigned blue,
|
|
unsigned transp, struct fb_info *info)
|
|
{
|
|
u32 value;
|
|
|
|
if (regno < 16) {
|
|
red >>= 8;
|
|
green >>= 8;
|
|
blue >>= 8;
|
|
|
|
value = (blue << 16) | (green << 8) | red;
|
|
((u32 *)info->pseudo_palette)[regno] = value;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct fb_ops gfb_ops = {
|
|
.owner = THIS_MODULE,
|
|
.fb_setcolreg = gfb_setcolreg,
|
|
.fb_fillrect = cfb_fillrect,
|
|
.fb_copyarea = cfb_copyarea,
|
|
.fb_imageblit = cfb_imageblit,
|
|
};
|
|
|
|
static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
|
|
{
|
|
struct fb_info *info = gp->info;
|
|
struct fb_var_screeninfo *var = &info->var;
|
|
|
|
info->flags = FBINFO_DEFAULT;
|
|
info->fbops = &gfb_ops;
|
|
info->screen_base = gp->fb_base;
|
|
info->screen_size = gp->fb_size;
|
|
|
|
info->pseudo_palette = gp->pseudo_palette;
|
|
|
|
/* Fill fix common fields */
|
|
strlcpy(info->fix.id, "gfb", sizeof(info->fix.id));
|
|
info->fix.smem_start = gp->fb_base_phys;
|
|
info->fix.smem_len = gp->fb_size;
|
|
info->fix.type = FB_TYPE_PACKED_PIXELS;
|
|
if (gp->depth == 32 || gp->depth == 24)
|
|
info->fix.visual = FB_VISUAL_TRUECOLOR;
|
|
else
|
|
info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
|
|
|
|
var->xres = gp->width;
|
|
var->yres = gp->height;
|
|
var->xres_virtual = var->xres;
|
|
var->yres_virtual = var->yres;
|
|
var->bits_per_pixel = gp->depth;
|
|
|
|
var->red.offset = 0;
|
|
var->red.length = 8;
|
|
var->green.offset = 8;
|
|
var->green.length = 8;
|
|
var->blue.offset = 16;
|
|
var->blue.length = 8;
|
|
var->transp.offset = 0;
|
|
var->transp.length = 0;
|
|
|
|
if (fb_alloc_cmap(&info->cmap, 256, 0)) {
|
|
printk(KERN_ERR "gfb: Cannot allocate color map.\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int __devinit gfb_probe(struct of_device *op,
|
|
const struct of_device_id *match)
|
|
{
|
|
struct device_node *dp = op->node;
|
|
struct fb_info *info;
|
|
struct gfb_info *gp;
|
|
int err;
|
|
|
|
info = framebuffer_alloc(sizeof(struct gfb_info), &op->dev);
|
|
if (!info) {
|
|
printk(KERN_ERR "gfb: Cannot allocate fb_info\n");
|
|
err = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
|
|
gp = info->par;
|
|
gp->info = info;
|
|
gp->of_node = dp;
|
|
|
|
gp->fb_base_phys = op->resource[6].start;
|
|
|
|
err = gfb_get_props(gp);
|
|
if (err)
|
|
goto err_release_fb;
|
|
|
|
/* Framebuffer length is the same regardless of resolution. */
|
|
info->fix.line_length = 16384;
|
|
gp->fb_size = info->fix.line_length * gp->height;
|
|
|
|
gp->fb_base = of_ioremap(&op->resource[6], 0,
|
|
gp->fb_size, "gfb fb");
|
|
if (!gp->fb_base)
|
|
goto err_release_fb;
|
|
|
|
err = gfb_set_fbinfo(gp);
|
|
if (err)
|
|
goto err_unmap_fb;
|
|
|
|
printk("gfb: Found device at %s\n", dp->full_name);
|
|
|
|
err = register_framebuffer(info);
|
|
if (err < 0) {
|
|
printk(KERN_ERR "gfb: Could not register framebuffer %s\n",
|
|
dp->full_name);
|
|
goto err_unmap_fb;
|
|
}
|
|
|
|
dev_set_drvdata(&op->dev, info);
|
|
|
|
return 0;
|
|
|
|
err_unmap_fb:
|
|
of_iounmap(&op->resource[6], gp->fb_base, gp->fb_size);
|
|
|
|
err_release_fb:
|
|
framebuffer_release(info);
|
|
|
|
err_out:
|
|
return err;
|
|
}
|
|
|
|
static int __devexit gfb_remove(struct of_device *op)
|
|
{
|
|
struct fb_info *info = dev_get_drvdata(&op->dev);
|
|
struct gfb_info *gp = info->par;
|
|
|
|
unregister_framebuffer(info);
|
|
|
|
iounmap(gp->fb_base);
|
|
|
|
of_iounmap(&op->resource[6], gp->fb_base, gp->fb_size);
|
|
|
|
framebuffer_release(info);
|
|
|
|
dev_set_drvdata(&op->dev, NULL);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id gfb_match[] = {
|
|
{
|
|
.name = "SUNW,gfb",
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, ffb_match);
|
|
|
|
static struct of_platform_driver gfb_driver = {
|
|
.name = "gfb",
|
|
.match_table = gfb_match,
|
|
.probe = gfb_probe,
|
|
.remove = __devexit_p(gfb_remove),
|
|
};
|
|
|
|
static int __init gfb_init(void)
|
|
{
|
|
if (fb_get_options("gfb", NULL))
|
|
return -ENODEV;
|
|
|
|
return of_register_driver(&gfb_driver, &of_bus_type);
|
|
}
|
|
|
|
static void __exit gfb_exit(void)
|
|
{
|
|
of_unregister_driver(&gfb_driver);
|
|
}
|
|
|
|
module_init(gfb_init);
|
|
module_exit(gfb_exit);
|
|
|
|
MODULE_DESCRIPTION("framebuffer driver for Sun XVR-1000 graphics");
|
|
MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
|
|
MODULE_VERSION("1.0");
|
|
MODULE_LICENSE("GPL");
|