Skip to content

Commit aababb9

Browse files
torvaldstorvalds
committed
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x
* '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
2 parents b2bc478 + 3e86f1d commit aababb9

File tree

9 files changed

+20
-34
lines changed

9 files changed

+20
-34
lines changed

‎drivers/video/amba-clcd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,8 @@ static int clcdfb_register(struct clcd_fb *fb)
447447
goto out;
448448
}
449449

450+
fb->fb.device = &fb->dev->dev;
451+
450452
fb->fb.fix.mmio_start = fb->dev->res.start;
451453
fb->fb.fix.mmio_len = resource_size(&fb->dev->res);
452454

‎drivers/video/fsl-diu-fb.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -555,8 +555,6 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var,
555555
static int fsl_diu_check_var(struct fb_var_screeninfo *var,
556556
struct fb_info *info)
557557
{
558-
unsigned long htotal, vtotal;
559-
560558
pr_debug("check_var xres: %d\n", var->xres);
561559
pr_debug("check_var yres: %d\n", var->yres);
562560

@@ -635,20 +633,6 @@ static int fsl_diu_check_var(struct fb_var_screeninfo *var,
635633

636634
break;
637635
}
638-
/* If the pixclock is below the minimum spec'd value then set to
639-
* refresh rate for 60Hz since this is supported by most monitors.
640-
* Refer to Documentation/fb/ for calculations.
641-
*/
642-
if ((var->pixclock < MIN_PIX_CLK) || (var->pixclock > MAX_PIX_CLK)) {
643-
htotal = var->xres + var->right_margin + var->hsync_len +
644-
var->left_margin;
645-
vtotal = var->yres + var->lower_margin + var->vsync_len +
646-
var->upper_margin;
647-
var->pixclock = (vtotal * htotal * 6UL) / 100UL;
648-
var->pixclock = KHZ2PICOS(var->pixclock);
649-
pr_debug("pixclock set for 60Hz refresh = %u ps\n",
650-
var->pixclock);
651-
}
652636

653637
var->height = -1;
654638
var->width = -1;

‎drivers/video/geode/gx1fb_core.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static int crt_option = 1;
2929
static char panel_option[32] = "";
3030

3131
/* Modes relevant to the GX1 (taken from modedb.c) */
32-
static const struct fb_videomode __initdata gx1_modedb[] = {
32+
static const struct fb_videomode __devinitdata gx1_modedb[] = {
3333
/* 640x480-60 VESA */
3434
{ NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
3535
0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
@@ -195,7 +195,7 @@ static int gx1fb_blank(int blank_mode, struct fb_info *info)
195195
return par->vid_ops->blank_display(info, blank_mode);
196196
}
197197

198-
static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
198+
static int __devinit gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *dev)
199199
{
200200
struct geodefb_par *par = info->par;
201201
unsigned gx_base;
@@ -268,7 +268,7 @@ static struct fb_ops gx1fb_ops = {
268268
.fb_imageblit = cfb_imageblit,
269269
};
270270

271-
static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
271+
static struct fb_info * __devinit gx1fb_init_fbinfo(struct device *dev)
272272
{
273273
struct geodefb_par *par;
274274
struct fb_info *info;
@@ -318,7 +318,7 @@ static struct fb_info * __init gx1fb_init_fbinfo(struct device *dev)
318318
return info;
319319
}
320320

321-
static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
321+
static int __devinit gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
322322
{
323323
struct geodefb_par *par;
324324
struct fb_info *info;
@@ -382,7 +382,7 @@ static int __init gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *
382382
return ret;
383383
}
384384

385-
static void gx1fb_remove(struct pci_dev *pdev)
385+
static void __devexit gx1fb_remove(struct pci_dev *pdev)
386386
{
387387
struct fb_info *info = pci_get_drvdata(pdev);
388388
struct geodefb_par *par = info->par;
@@ -441,7 +441,7 @@ static struct pci_driver gx1fb_driver = {
441441
.name = "gx1fb",
442442
.id_table = gx1fb_id_table,
443443
.probe = gx1fb_probe,
444-
.remove = gx1fb_remove,
444+
.remove = __devexit_p(gx1fb_remove),
445445
};
446446

447447
static int __init gx1fb_init(void)
@@ -456,7 +456,7 @@ static int __init gx1fb_init(void)
456456
return pci_register_driver(&gx1fb_driver);
457457
}
458458

459-
static void __exit gx1fb_cleanup(void)
459+
static void __devexit gx1fb_cleanup(void)
460460
{
461461
pci_unregister_driver(&gx1fb_driver);
462462
}

‎drivers/video/hecubafb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
233233

234234
videomemory = vzalloc(videomemorysize);
235235
if (!videomemory)
236-
return retval;
236+
goto err_videomem_alloc;
237237

238238
info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
239239
if (!info)
@@ -275,6 +275,7 @@ static int __devinit hecubafb_probe(struct platform_device *dev)
275275
framebuffer_release(info);
276276
err_fballoc:
277277
vfree(videomemory);
278+
err_videomem_alloc:
278279
module_put(board->owner);
279280
return retval;
280281
}

‎drivers/video/sh_mobile_meram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata,
218218
icb_offset = 0xc0000000 | (cfg->current_reg << 23);
219219

220220
*icb_addr_y = icb_offset | (cfg->icb[0].marker_icb << 24);
221-
if ((*icb_addr_c) && is_nvcolor(cfg->pixelformat))
221+
if (is_nvcolor(cfg->pixelformat))
222222
*icb_addr_c = icb_offset | (cfg->icb[1].marker_icb << 24);
223223
}
224224

‎drivers/video/sm501fb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1664,7 +1664,7 @@ static void sm501fb_stop(struct sm501fb_info *info)
16641664
resource_size(info->regs_res));
16651665
}
16661666

1667-
static int sm501fb_init_fb(struct fb_info *fb,
1667+
static int __devinit sm501fb_init_fb(struct fb_info *fb,
16681668
enum sm501_controller head,
16691669
const char *fbname)
16701670
{

‎drivers/video/udlfb.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,8 +1233,12 @@ static int dlfb_setup_modes(struct dlfb_data *dev,
12331233
if (dlfb_is_valid_mode(&info->monspecs.modedb[i], info))
12341234
fb_add_videomode(&info->monspecs.modedb[i],
12351235
&info->modelist);
1236-
else /* if we've removed top/best mode */
1237-
info->monspecs.misc &= ~FB_MISC_1ST_DETAIL;
1236+
else {
1237+
if (i == 0)
1238+
/* if we've removed top/best mode */
1239+
info->monspecs.misc
1240+
&= ~FB_MISC_1ST_DETAIL;
1241+
}
12381242
}
12391243

12401244
default_vmode = fb_find_best_display(&info->monspecs,

‎drivers/video/vesafb.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
175175

176176
static void vesafb_destroy(struct fb_info *info)
177177
{
178+
fb_dealloc_cmap(&info->cmap);
178179
if (info->screen_base)
179180
iounmap(info->screen_base);
180181
release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);

‎include/linux/fsl-diu-fb.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
* See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
2525
*/
2626
#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
27-
/* Minimum value that the pixel clock can be set to in pico seconds
28-
* This is determined by platform clock/3 where the minimum platform
29-
* clock is 533MHz. This gives 5629 pico seconds.
30-
*/
31-
#define MIN_PIX_CLK 5629
32-
#define MAX_PIX_CLK 96096
3327

3428
#include <linux/types.h>
3529

0 commit comments

Comments
 (0)