linux-toradex.git/drivers/video, branch v3.3.6

video:uvesafb: Fix oops that uvesafb try to execute NX-protected page

2012-04-22T22:38:58+00:00

commit b78f29ca0516266431688c5eb42d39ce42ec039a upstream.

This patch fix the oops below that catched in my machine

[   81.560602] uvesafb: NVIDIA Corporation, GT216 Board - 0696a290, Chip Rev   , OEM: NVIDIA, VBE v3.0
[   81.609384] uvesafb: protected mode interface info at c000:d350
[   81.609388] uvesafb: pmi: set display start = c00cd3b3, set palette = c00cd40e
[   81.609390] uvesafb: pmi: ports = 3b4 3b5 3ba 3c0 3c1 3c4 3c5 3c6 3c7 3c8 3c9 3cc 3ce 3cf 3d0 3d1 3d2 3d3 3d4 3d5 3da
[   81.614558] uvesafb: VBIOS/hardware doesn't support DDC transfers
[   81.614562] uvesafb: no monitor limits have been set, default refresh rate will be used
[   81.614994] uvesafb: scrolling: ypan using protected mode interface, yres_virtual=4915
[   81.744147] kernel tried to execute NX-protected page - exploit attempt? (uid: 0)
[   81.744153] BUG: unable to handle kernel paging request at c00cd3b3
[   81.744159] IP: [] 0xc00cd3b2
[   81.744167] *pdpt = 00000000016d6001 *pde = 0000000001c7b067 *pte = 80000000000cd163
[   81.744171] Oops: 0011 [#1] SMP
[   81.744174] Modules linked in: uvesafb(+) cfbcopyarea cfbimgblt cfbfillrect
[   81.744178]
[   81.744181] Pid: 3497, comm: modprobe Not tainted 3.3.0-rc4NX+ #71 Acer            Aspire 4741                    /Aspire 4741
[   81.744185] EIP: 0060:[] EFLAGS: 00010246 CPU: 0
[   81.744187] EIP is at 0xc00cd3b3
[   81.744189] EAX: 00004f07 EBX: 00000000 ECX: 00000000 EDX: 00000000
[   81.744191] ESI: f763f000 EDI: f763f6e8 EBP: f57f3a0c ESP: f57f3a00
[   81.744192]  DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
[   81.744195] Process modprobe (pid: 3497, ti=f57f2000 task=f748c600 task.ti=f57f2000)
[   81.744196] Stack:
[   81.744197]  f82512c5 f759341c 00000000 f57f3a30 c124a9bc 00000001 00000001 000001e0
[   81.744202]  f8251280 f763f000 f7593400 00000000 f57f3a40 c12598dd f5c0c000 00000000
[   81.744206]  f57f3b10 c1255efe c125a21a 00000006 f763f09c 00000000 c1c6cb60 f7593400
[   81.744210] Call Trace:
[   81.744215]  [] ? uvesafb_pan_display+0x45/0x60 [uvesafb]
[   81.744222]  [] fb_pan_display+0x10c/0x160
[   81.744226]  [] ? uvesafb_vbe_find_mode+0x180/0x180 [uvesafb]
[   81.744230]  [] bit_update_start+0x1d/0x50
[   81.744232]  [] fbcon_switch+0x39e/0x550
[   81.744235]  [] ? bit_cursor+0x4ea/0x560
[   81.744240]  [] redraw_screen+0x12b/0x220
[   81.744245]  [] ? tty_do_resize+0x3b/0xc0
[   81.744247]  [] vc_do_resize+0x3d2/0x3e0
[   81.744250]  [] vc_resize+0x14/0x20
[   81.744253]  [] fbcon_init+0x29d/0x500
[   81.744255]  [] ? set_inverse_trans_unicode+0xe4/0x110
[   81.744258]  [] visual_init+0xb8/0x150
[   81.744261]  [] bind_con_driver+0x16c/0x360
[   81.744264]  [] ? register_con_driver+0x6e/0x190
[   81.744267]  [] take_over_console+0x41/0x50
[   81.744269]  [] fbcon_takeover+0x6a/0xd0
[   81.744272]  [] fbcon_event_notify+0x758/0x790
[   81.744277]  [] notifier_call_chain+0x42/0xb0
[   81.744280]  [] __blocking_notifier_call_chain+0x60/0x90
[   81.744283]  [] blocking_notifier_call_chain+0x1a/0x20
[   81.744285]  [] fb_notifier_call_chain+0x11/0x20
[   81.744288]  [] register_framebuffer+0x1d9/0x2b0
[   81.744293]  [] ? ioremap_wc+0x33/0x40
[   81.744298]  [] uvesafb_probe+0xaba/0xc40 [uvesafb]
[   81.744302]  [] platform_drv_probe+0xf/0x20
[   81.744306]  [] driver_probe_device+0x68/0x170
[   81.744309]  [] __device_attach+0x41/0x50
[   81.744313]  [] bus_for_each_drv+0x48/0x70
[   81.744316]  [] device_attach+0x83/0xa0
[   81.744319]  [] ? __driver_attach+0x90/0x90
[   81.744321]  [] bus_probe_device+0x6f/0x90
[   81.744324]  [] device_add+0x5e5/0x680
[   81.744329]  [] ? kvasprintf+0x43/0x60
[   81.744332]  [] ? kobject_set_name_vargs+0x64/0x70
[   81.744335]  [] ? kobject_set_name_vargs+0x64/0x70
[   81.744339]  [] platform_device_add+0xff/0x1b0
[   81.744343]  [] uvesafb_init+0x50/0x9b [uvesafb]
[   81.744346]  [] do_one_initcall+0x2f/0x170
[   81.744350]  [] ? uvesafb_is_valid_mode+0x66/0x66 [uvesafb]
[   81.744355]  [] sys_init_module+0xf4/0x1410
[   81.744359]  [] ? vfsmount_lock_local_unlock_cpu+0x30/0x30
[   81.744363]  [] sysenter_do_call+0x12/0x36
[   81.744365] Code: f5 00 00 00 32 f6 66 8b da 66 d1 e3 66 ba d4 03 8a e3 b0 1c 66 ef b0 1e 66 ef 8a e7 b0 1d 66 ef b0 1f 66 ef e8 fa 00 00 00 61 c3 <60> e8 c8 00 00 00 66 8b f3 66 8b da 66 ba d4 03 b0 0c 8a e5 66
[   81.744388] EIP: [] 0xc00cd3b3 SS:ESP 0068:f57f3a00
[   81.744391] CR2: 00000000c00cd3b3
[   81.744393] ---[ end trace 18b2c87c925b54d6 ]---

Signed-off-by: Wang YanQing 
Cc: Michal Januszewski 
Cc: Alan Cox 
Signed-off-by: Florian Tobias Schandinat 
Signed-off-by: Greg Kroah-Hartman

backlight: fix typo in tosa_lcd.c

2012-04-02T17:32:21+00:00

commit 8da00edc1069f01c34510fa405dc15d96c090a3f upstream.

Fix typo in drivers/video/backlight/tosa_lcd.c
"tosa_lcd_reume" should be "tosa_lcd_resume".

Signed-off-by: Masanari Iida 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

udlfb: remove sysfs framebuffer device with USB .disconnect()

2012-04-02T17:31:55+00:00

commit ce880cb860f36694d2cdebfac9e6ae18176fe4c4 upstream.

The USB graphics card driver delays the unregistering of the framebuffer
device to a workqueue, which breaks the userspace visible remove uevent
sequence. Recent userspace tools started to support USB graphics card
hotplug out-of-the-box and rely on proper events sent by the kernel.

The framebuffer device is a direct child of the USB interface which is
removed immediately after the USB .disconnect() callback. But the fb device
in /sys stays around until its final cleanup, at a time where all the parent
devices have been removed already.

To work around that, we remove the sysfs fb device directly in the USB
.disconnect() callback and leave only the cleanup of the internal fb
data to the delayed work.

Before:
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (usb)
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0 (usb)
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/graphics/fb0 (graphics)
 remove   /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0 (usb)
 remove   /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (usb)
 remove   /2-1.2:1.0/graphics/fb0 (graphics)

After:
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (usb)
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0 (usb)
 add      /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/graphics/fb1 (graphics)
 remove   /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/graphics/fb1 (graphics)
 remove   /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0 (usb)
 remove   /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (usb)

Tested-by: Bernie Thompson 
Acked-by: Bernie Thompson 
Signed-off-by: Kay Sievers 
Signed-off-by: Florian Tobias Schandinat 
Signed-off-by: Greg Kroah-Hartman

drivers/video/backlight/s6e63m0.c: fix corruption storing gamma mode

2012-03-16T00:03:04+00:00

strict_strtoul() writes a long but ->gamma_mode only has space to store an
int, so on 64 bit systems we end up scribbling over ->gamma_table_count as
well.  I've changed it to use kstrtouint() instead.

Signed-off-by: Dan Carpenter 
Acked-by: Inki Dae 
Signed-off-by: Florian Tobias Schandinat 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

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

2012-03-02T23:21:15+00:00

fbdev fixes for 3.3 from Florian Tobias Schandinat

It includes:
 - two fixes for OMAP HDMI
 - one fix to make new OMAP functions behave as they are supposed to
 - one Kconfig dependency fix
 - two fixes for viafb for modesetting on VX900 hardware

* tag 'fbdev-fixes-for-3.3-2' of git://github.com/schandinat/linux-2.6:
  OMAPDSS: APPLY: make ovl_enable/disable synchronous
  OMAPDSS: panel-dvi: Add Kconfig dependency on I2C
  viafb: fix IGA1 modesetting on VX900
  viafb: select HW scaling on VX900 for IGA2
  OMAPDSS: HDMI: hot plug detect fix
  OMAPDSS: HACK: Ensure DSS clock domain gets out of idle when HDMI is enabled

OMAPDSS: APPLY: make ovl_enable/disable synchronous

2012-02-29T22:42:28+00:00

ovl->enable/disable are meant to be synchronous so that they can handle
the configuration of fifo sizes. The current kernel doesn't configure
fifo sizes yet, and so the code doesn't need to block to function (from
omapdss driver's perspective).

However, for the users of omapdss a non-blocking ovl->disable is
confusing, because they don't know when the memory area is not used
any more.

Furthermore, when the fifo size configuration is added in the next merge
window, the change from non-blocking to blocking could cause side
effects to the users of omapdss. So by making the functions block
already will keep them behaving in the same manner.

And, while not the main purpose of this patch, this will also remove the
compile warning:

drivers/video/omap2/dss/apply.c:350: warning:
'wait_pending_extra_info_updates' defined but not used

Signed-off-by: Tomi Valkeinen 
Signed-off-by: Florian Tobias Schandinat

OMAPDSS: panel-dvi: Add Kconfig dependency on I2C

2012-02-29T22:42:28+00:00

panel-dvi uses i2c, but the Kconfig didn't have dependency on I2C. Add
it.

Signed-off-by: Tomi Valkeinen 
Signed-off-by: Florian Tobias Schandinat

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

2012-02-24T16:56:51+00:00

SuperH fixes for 3.3-rc5

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh: Fix sh2a build error for CONFIG_CACHE_WRITETHROUGH
  sh: modify a resource of sh_eth_giga1_resources in board-sh7757lcr
  arch/sh: remove references to cpu_*_map.
  sh: Fix typo in pci-sh7780.c
  sh: add platform_device for SPI1 in setup-sh7757
  sh: modify resource for SPI0 in setup-sh7757
  sh: se7724: fix compile breakage
  sh: clkfwk: bugfix: use clk_reparent() for div6 clocks
  sh: clock-sh7724: fixup sh_fsi clock settings
  sh: sh7757lcr: update to the new MMCIF DMA configuration
  sh: fix the sh_mmcif_plat_data in board-sh7757lcr
  video: pvr2fb: Fix up spurious section mismatch warnings.
  sh: Defer to asm-generic/device.h.

viafb: fix IGA1 modesetting on VX900

2012-02-24T00:38:14+00:00

Even if the documentation calls this bit "Reserved" it has to be set
to 0 for correct modesetting on IGA1.

Signed-off-by: Florian Tobias Schandinat 
Cc: stable@vger.kernel.org

viafb: select HW scaling on VX900 for IGA2

2012-02-24T00:38:02+00:00

VX900 can do hardware scaling for both IGAs in contrast to previous
hardware which could do it only for IGA2. This patch ensures that
we set the parameter for IGA2 and not for IGA1. This fixes hardware
scaling on VX900 until we have the infrastructure to support it for
both IGAs.

Signed-off-by: Florian Tobias Schandinat 
Cc: stable@vger.kernel.org