tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

Pull fbdev fixes from Florian Tobias Schandinat:

- two fixes for s3c-fb by Jingoo Han (including a fix for a potential
division by zero)

- a couple of randconfig fixes by Arnd Bergmann

- a cleanup for bfin_adv7393fb by Emil Goode

* tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
drivers/tosa: driver needs I2C and SPI to compile
drivers/savagefb: use mdelay instead of udelay
video/console: automatically select a font
video/ili9320: do not mark exported functions __devexit
drivers/video: use correct __devexit_p annotation
video: bfin_adv7393fb: Convert to kstrtouint_from_user

Linus Torvalds 88c144b1 9b15b817

+34 -16
+1 -1
drivers/video/backlight/Kconfig
··· 88 88 89 89 config LCD_TOSA 90 90 tristate "Sharp SL-6000 LCD Driver" 91 - depends on SPI && MACH_TOSA 91 + depends on I2C && SPI && MACH_TOSA 92 92 help 93 93 If you have an Sharp SL-6000 Zaurus say Y to enable a driver 94 94 for its LCD.
+1 -1
drivers/video/backlight/ili9320.c
··· 263 263 264 264 EXPORT_SYMBOL_GPL(ili9320_probe_spi); 265 265 266 - int __devexit ili9320_remove(struct ili9320 *ili) 266 + int ili9320_remove(struct ili9320 *ili) 267 267 { 268 268 ili9320_power(ili, FB_BLANK_POWERDOWN); 269 269
+2 -4
drivers/video/bfin_adv7393fb.c
··· 353 353 354 354 static int 355 355 adv7393_write_proc(struct file *file, const char __user * buffer, 356 - unsigned long count, void *data) 356 + size_t count, void *data) 357 357 { 358 358 struct adv7393fb_device *fbdev = data; 359 - char line[8]; 360 359 unsigned int val; 361 360 int ret; 362 361 363 - ret = copy_from_user(line, buffer, count); 362 + ret = kstrtouint_from_user(buffer, count, 0, &val); 364 363 if (ret) 365 364 return -EFAULT; 366 365 367 - val = simple_strtoul(line, NULL, 0); 368 366 adv7393_write(fbdev->client, val >> 8, val & 0xff); 369 367 370 368 return count;
+1 -1
drivers/video/broadsheetfb.c
··· 1211 1211 1212 1212 static struct platform_driver broadsheetfb_driver = { 1213 1213 .probe = broadsheetfb_probe, 1214 - .remove = broadsheetfb_remove, 1214 + .remove = __devexit_p(broadsheetfb_remove), 1215 1215 .driver = { 1216 1216 .owner = THIS_MODULE, 1217 1217 .name = "broadsheetfb",
+14
drivers/video/console/Kconfig
··· 224 224 big letters. It fits between the sun 12x22 and the normal 8x16 font. 225 225 If other fonts are too big or too small for you, say Y, otherwise say N. 226 226 227 + config FONT_AUTOSELECT 228 + def_bool y 229 + depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON 230 + depends on !FONT_8x8 231 + depends on !FONT_6x11 232 + depends on !FONT_7x14 233 + depends on !FONT_PEARL_8x8 234 + depends on !FONT_ACORN_8x8 235 + depends on !FONT_MINI_4x6 236 + depends on !FONT_SUN8x16 237 + depends on !FONT_SUN12x22 238 + depends on !FONT_10x18 239 + select FONT_8x16 240 + 227 241 endmenu 228 242
+1 -1
drivers/video/mbx/mbxfb.c
··· 1045 1045 1046 1046 static struct platform_driver mbxfb_driver = { 1047 1047 .probe = mbxfb_probe, 1048 - .remove = mbxfb_remove, 1048 + .remove = __devexit_p(mbxfb_remove), 1049 1049 .suspend = mbxfb_suspend, 1050 1050 .resume = mbxfb_resume, 1051 1051 .driver = {
+9 -3
drivers/video/s3c-fb.c
··· 361 361 result = (unsigned int)tmp / 1000; 362 362 363 363 dev_dbg(sfb->dev, "pixclk=%u, clk=%lu, div=%d (%lu)\n", 364 - pixclk, clk, result, clk / result); 364 + pixclk, clk, result, result ? clk / result : clk); 365 365 366 366 return result; 367 367 } ··· 1348 1348 writel(0, regs + VIDOSD_A(win, sfb->variant)); 1349 1349 writel(0, regs + VIDOSD_B(win, sfb->variant)); 1350 1350 writel(0, regs + VIDOSD_C(win, sfb->variant)); 1351 - reg = readl(regs + SHADOWCON); 1352 - writel(reg & ~SHADOWCON_WINx_PROTECT(win), regs + SHADOWCON); 1351 + 1352 + if (sfb->variant.has_shadowcon) { 1353 + reg = readl(sfb->regs + SHADOWCON); 1354 + reg &= ~(SHADOWCON_WINx_PROTECT(win) | 1355 + SHADOWCON_CHx_ENABLE(win) | 1356 + SHADOWCON_CHx_LOCAL_ENABLE(win)); 1357 + writel(reg, sfb->regs + SHADOWCON); 1358 + } 1353 1359 } 1354 1360 1355 1361 static int __devinit s3c_fb_probe(struct platform_device *pdev)
+5 -5
drivers/video/savage/savagefb_driver.c
··· 1351 1351 /* following part not present in X11 driver */ 1352 1352 cr67 = vga_in8(0x3d5, par) & 0xf; 1353 1353 vga_out8(0x3d5, 0x50 | cr67, par); 1354 - udelay(10000); 1354 + mdelay(10); 1355 1355 vga_out8(0x3d4, 0x67, par); 1356 1356 /* end of part */ 1357 1357 vga_out8(0x3d5, reg->CR67 & ~0x0c, par); ··· 1904 1904 vga_out8(0x3d4, 0x66, par); 1905 1905 cr66 = vga_in8(0x3d5, par); 1906 1906 vga_out8(0x3d5, cr66 | 0x02, par); 1907 - udelay(10000); 1907 + mdelay(10); 1908 1908 1909 1909 vga_out8(0x3d4, 0x66, par); 1910 1910 vga_out8(0x3d5, cr66 & ~0x02, par); /* clear reset flag */ 1911 - udelay(10000); 1911 + mdelay(10); 1912 1912 1913 1913 1914 1914 /* ··· 1918 1918 vga_out8(0x3d4, 0x3f, par); 1919 1919 cr3f = vga_in8(0x3d5, par); 1920 1920 vga_out8(0x3d5, cr3f | 0x08, par); 1921 - udelay(10000); 1921 + mdelay(10); 1922 1922 1923 1923 vga_out8(0x3d4, 0x3f, par); 1924 1924 vga_out8(0x3d5, cr3f & ~0x08, par); /* clear reset flags */ 1925 - udelay(10000); 1925 + mdelay(10); 1926 1926 1927 1927 /* Savage ramdac speeds */ 1928 1928 par->numClocks = 4;