kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x

Browse source 
* 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x:
  vesafb: fix memory leak
  fbdev: amba: Link fb device to its parent
  fsl-diu-fb: remove check for pixel clock ranges
  udlfb: Correct sub-optimal resolution selection.
  hecubafb: add module_put on error path in hecubafb_probe()
  sm501fb: fix section mismatch warning
  gx1fb: Fix section mismatch warnings
  fbdev: sh_mobile_meram: Correct pointer check for YCbCr chroma plane
This commit is contained in:
Linus Torvalds 2011-07-04 15:53:53 -07:00
commit aababb9766
9 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/amba-clcd.c
View file

@ -447,6 +447,8 @@ static int clcdfb_register(struct clcd_fb *fb)
goto out; goto out;
} }
fb->fb.device = &fb->dev->dev;
fb->fb.fix.mmio_start = fb->dev->res.start; fb->fb.fix.mmio_start = fb->dev->res.start;
fb->fb.fix.mmio_len = resource_size(&fb->dev->res); fb->fb.fix.mmio_len = resource_size(&fb->dev->res);

16
drivers/video/fsl-diu-fb.c
View file

@ -555,8 +555,6 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
static int fsl_diu_check_var(struct fb_var_screeninfo *var, static int fsl_diu_check_var(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
unsigned long htotal, vtotal;
pr_debug("check_var xres: %d\n", var->xres); pr_debug("check_var xres: %d\n", var->xres);
pr_debug("check_var yres: %d\n", var->yres); pr_debug("check_var yres: %d\n", var->yres);
@ -635,20 +633,6 @@ static int fsl_diu_check_var(struct fb_var_screeninfo *var,
break; break;
} }
/* If the pixclock is below the minimum spec'd value then set to
* refresh rate for 60Hz since this is supported by most monitors.
* Refer to Documentation/fb/ for calculations.
*/
if ((var->pixclock < MIN_PIX_CLK) || (var->pixclock > MAX_PIX_CLK)) {
htotal = var->xres + var->right_margin + var->hsync_len +
var->left_margin;
vtotal = var->yres + var->lower_margin + var->vsync_len +
var->upper_margin;
var->pixclock = (vtotal * htotal * 6UL) / 100UL;
var->pixclock = KHZ2PICOS(var->pixclock);
pr_debug("pixclock set for 60Hz refresh = %u ps\n",
var->pixclock);
}
var->height = -1; var->height = -1;
var->width = -1; var->width = -1;

14
drivers/video/geode/gx1fb_core.c
View file

@ -29,7 +29,7 @@ static int crt_option = 1;
static char panel_option[32] = ""; static char panel_option[32] = "";
/* Modes relevant to the GX1 (taken from modedb.c) */ /* Modes relevant to the GX1 (taken from modedb.c) */
static const struct fb_videomode __initdata gx1_modedb[] = { static const struct fb_videomode __devinitdata gx1_modedb[] = {
/* 640x480-60 VESA */ /* 640x480-60 VESA */
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
return par->vid_ops->blank_display(info, blank_mode); return par->vid_ops->blank_display(info, blank_mode);
} }
static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev) static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
{ {
struct geodefb_par *par = info->par; struct geodefb_par *par = info->par;
unsigned gx_base; unsigned gx_base;
@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
}; };
static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev) static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
{ {
struct geodefb_par *par; struct geodefb_par *par;
struct fb_info *info; struct fb_info *info;
@ -318,7 +318,7 @@ static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
return info; return info;
} }
static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct geodefb_par *par; struct geodefb_par *par;
struct fb_info *info; struct fb_info *info;
@ -382,7 +382,7 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *
return ret; return ret;
} }
static void gx1fb_remove(struct pci_dev *pdev) static void __devexit gx1fb_remove(struct pci_dev *pdev)
{ {
struct fb_info *info = pci_get_drvdata(pdev); struct fb_info *info = pci_get_drvdata(pdev);
struct geodefb_par *par = info->par; struct geodefb_par *par = info->par;
@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
.name = "gx1fb", .name = "gx1fb",
.id_table = gx1fb_id_table, .id_table = gx1fb_id_table,
.probe = gx1fb_probe, .probe = gx1fb_probe,
.remove = gx1fb_remove, .remove = __devexit_p(gx1fb_remove),
}; };
static int __init gx1fb_init(void) static int __init gx1fb_init(void)
@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
return pci_register_driver(&gx1fb_driver); return pci_register_driver(&gx1fb_driver);
} }
static void __exit gx1fb_cleanup(void) static void __devexit gx1fb_cleanup(void)
{ {
pci_unregister_driver(&gx1fb_driver); pci_unregister_driver(&gx1fb_driver);
} }

3
drivers/video/hecubafb.c
View file

@ -233,7 +233,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
videomemory = vzalloc(videomemorysize); videomemory = vzalloc(videomemorysize);
if (!videomemory) if (!videomemory)
return retval; goto err_videomem_alloc;
info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev); info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
if (!info) if (!info)
@ -275,6 +275,7 @@ err_fbreg:
framebuffer_release(info); framebuffer_release(info);
err_fballoc: err_fballoc:
vfree(videomemory); vfree(videomemory);
err_videomem_alloc:
module_put(board->owner); module_put(board->owner);
return retval; return retval;
} }

2
drivers/video/sh_mobile_meram.c
View file

@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata,
icb_offset = 0xc0000000 | (cfg->current_reg << 23); icb_offset = 0xc0000000 | (cfg->current_reg << 23);
*icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24); *icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24);
if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat)) if (is_nvcolor(cfg->pixelformat))
*icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24); *icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24);
} }

2
drivers/video/sm501fb.c
View file

@ -1664,7 +1664,7 @@ static void sm501fb_stop(struct sm501fb_info *info)
resource_size(info->regs_res)); resource_size(info->regs_res));
} }
static int sm501fb_init_fb(struct fb_info *fb, static int __devinit sm501fb_init_fb(struct fb_info *fb,
enum sm501_controller head, enum sm501_controller head,
const char *fbname) const char *fbname)
{ {

8
drivers/video/udlfb.c
View file

@ -1233,8 +1233,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
if (dlfb_is_valid_mode(&info->monspecs.modedb[i], info)) if (dlfb_is_valid_mode(&info->monspecs.modedb[i], info))
fb_add_videomode(&info->monspecs.modedb[i], fb_add_videomode(&info->monspecs.modedb[i],
&info->modelist); &info->modelist);
else /* if we've removed top/best mode */ else {
info->monspecs.misc &= ~FB_MISC_1ST_DETAIL; if (i == 0)
/* if we've removed top/best mode */
info->monspecs.misc
&= ~FB_MISC_1ST_DETAIL;
}
} }
default_vmode = fb_find_best_display(&info->monspecs, default_vmode = fb_find_best_display(&info->monspecs,

1
drivers/video/vesafb.c
View file

@ -175,6 +175,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
static void vesafb_destroy(struct fb_info *info) static void vesafb_destroy(struct fb_info *info)
{ {
fb_dealloc_cmap(&info->cmap);
if (info->screen_base) if (info->screen_base)
iounmap(info->screen_base); iounmap(info->screen_base);
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size); release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);

6
include/linux/fsl-diu-fb.h
View file

@ -24,12 +24,6 @@
* See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
*/ */
#define MEM_ALLOC_THRESHOLD (1024*768*4+32) #define MEM_ALLOC_THRESHOLD (1024*768*4+32)
/* Minimum value that the pixel clock can be set to in pico seconds
* This is determined by platform clock/3 where the minimum platform
* clock is 533MHz. This gives 5629 pico seconds.
*/
#define MIN_PIX_CLK 5629
#define MAX_PIX_CLK 96096
#include <linux/types.h> #include <linux/types.h>