linux-stable.git/drivers/video/console, branch linux-2.6.32.y

fbcon: Bugfix soft cursor detection in Tile Blitting

2011-03-27T18:30:39+00:00

commit d6244bc0ed0c52a795e6f4dcab3886daf3e74fac upstream.

Use mask 0x10 for "soft cursor" detection on in function tile_cursor.
(Tile Blitting Operation in framebuffer console).

The old mask 0x01 for vc_cursor_type detects CUR_NONE, CUR_LOWER_THIRD
and every second mode value as "software cursor". This hides the cursor
for these modes (cursor.mode = 0). But, only CUR_NONE or "software cursor"
should hide the cursor.
See also 0x10 in functions add_softcursor, bit_cursor and cw_cursor.

Signed-off-by: Henry Nestler 
Signed-off-by: Paul Mundt 
Signed-off-by: Greg Kroah-Hartman

fb: remove fb_save_state() and fb_restore_state operations

2009-11-12T15:25:56+00:00

Remove fb_save_state() and fb_restore_state operations from frame buffer layer.
They are used only in two drivers:
1. savagefb  - and cause bug #11248
2. uvesafb

Usage of these operations is misunderstood in both drivers so kill these
operations, fix the bug #11248 and avoid confusion in the future.

Tested on Savage 3D/MV card and the patch fixes the bug #11248.

The frame buffer layer uses these funtions during switch between graphics
and text mode of the console, but these drivers saves state before
switching of the frame buffer (in the fb_open) and after releasing it (in
the fb_release).  This defeats the purpose of these operations.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11248

Signed-off-by: Krzysztof Helt 
Reported-by: Jochen Hein 
Tested-by: Jochen Hein 
Cc: Geert Uytterhoeven 
Cc: Michal Januszewski 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

vgacon: prevent vgacon_deinit from touching the hardware for inactive consoles.

2009-09-23T14:39:57+00:00

fbcon makes the (reasonable) assumption that it only needs to program the
hardware once, when fbcon_init() is called for the foreground console.

This doesn't always play well with vgacon because vgacon_deinit() is only
doing its job when the last console it owns is closed (when switching from
vgacon to fbcon, that's usually *after* fbcon_init() has set the new
mode).

Depending on the hardware this can cause the wrong framebuffer location to
be scanned out (e.g.  reproduced on nv05 with the nouveau framebuffer
driver).

Signed-off-by: Francisco Jerez 
Cc: "H. Peter Anvin" 
Cc: Alan Cox 
Cc: Krzysztof Helt 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

fbcon: only unbind from console if successfully registered

2009-09-23T14:39:57+00:00

Attempting to unload a framebuffer module calls unregister_framebuffer()
which in turn gets fbcon to release it.  If fbcon has no framebuffers
linked to a console, it will also unbind itself from the console driver.
However, if fbcon never registered itself as a console driver, the unbind
will fail causing the framebuffer device entry to persist.  In most cases
this failure will result in an oops when attempting to access the now
non-existent device.

This patch ensures that the fbcon unbind request will succeed even if a
bind was never done.  It tracks if a successful bind ever occurred & will
only attempt to unbind if needed.  If there never was a bind, it simply
returns with no error.

Signed-off-by: Ian Armstrong 
Cc: Krzysztof Helt 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

fb: do not ignore fb_set_par errors

2009-09-23T14:39:56+00:00

At the moment about half of the framebuffer drivers can return an error
code in fb_set_par. Until now it would be silently ignored by fbmem.c
and fbcon.c. This patch fixes fbmem.c to return the error code and
restore var on error.

But it is not clear in which video mode the device is when fb_set_par
fails.  It would be good and reasonable if it were in the old state but
there is no guarantee that this is true for all existing drivers.
Additionally print a message if a failing fb_set_par is detected in
fbmem.c or fbcon.c.

Although most errors should be caught by the previous fb_check_var some
errors can't as they are dynamic (memory allocations, ...) and can only be
detected while performing the operations which is forbidden in
fb_check_var.

This patch shouldn't have a negative impact on normal operation as all
drivers return 0 on success.  The impact in case of error depends heavily
on the driver and caller but it's expected to be better than before.

Signed-off-by: Florian Tobias Schandinat 
Cc: Krzysztof Helt 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

video: console, use DIV_ROUND_UP

2009-09-23T14:39:56+00:00

Use DIV_ROUND_UP explicitly instead of manual shifts and adds.  It makes
the code more readable and consistent (sometimes there were shifts,
sometimes divs).

There is no change on the assembly level (compilers should do the right
job).

Signed-off-by: Jiri Slaby 
Cc: Sergey Senozhatsky 
Cc: Andi Kleen 
Cc: Krzysztof Helt 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

drivers/video/console/newport_con.c: fix read outside array bounds

2009-09-23T14:39:56+00:00

It reads linetable[] before checking bounds of index, and ARRAY_SIZE is
required because linetable[] are unsigned shorts.

Signed-off-by: Roel Kluin 
Cc: Ralf Baechle 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

includecheck fix: drivers/video, vgacon.c

2009-09-20T10:31:58+00:00

fix the following 'make includecheck' warning:

  drivers/video/console/vgacon.c: linux/slab.h is included more than once.

Signed-off-by: Jaswinder Singh Rajput 
Cc: Martin Mares 
Cc: mchehab@infradead.org
Cc: Sam Ravnborg 
LKML-Reference: <1247067624.4382.88.camel@ht.satnam>

sparc: Kill PROM console driver.

2009-09-16T00:04:38+00:00

Many years ago when this driver was written, it had a use, but these
days it's nothing but trouble and distributions should not enable it
in any situation.

Pretty much every console device a sparc machine could see has a
bonafide real driver, making the PROM console hack unnecessary.

If any new device shows up, we should write a driver instead of
depending upon this crutch to save us.  We've been able to take care
of this even when no chip documentation exists (sunxvr500, sunxvr2500)
so there are no excuses.

Signed-off-by: David S. Miller

fbcon: don't use vc_resize() on initialization

2009-08-07T17:39:56+00:00

Catalin and kmemleak spotted a leak of a VC screen buffer in
vc_allocate() due to the following chain of events:

	vc_allocate()
	  visual_init(init=1)
	    vc->vc_sw->con_init(init=1)
              fbcon_init()
	        vc_resize()
	          vc->screen_buf = kmalloc()
	  vc->screen_buf = kmalloc()

The common way for the VC drivers is to set the screen dimension
parameters manually in the init case and only call vc_resize() for
!init - which allocates a screen buffer according to the new
dimensions.

fbcon instead would do vc_resize() unconditionally and afterwards set
the dimensions manually (again) for !init - i.e. completely upside
down.  The vc_resize() allocated buffer would then get lost by
vc_allocate() allocating a fresh one.

Use vc_resize() only for actual resizing to close the leak.

Set the dimensions manually only in initialization mode to remove the
redundant setting in resize mode.

The kmemleak trace from Catalin:

unreferenced object 0xde158000 (size 12288):
  comm "Xorg", pid 1439, jiffies 4294961016
  hex dump (first 32 bytes):
    20 00 20 00 20 00 20 00 20 00 20 00 20 00 20 00   . . . . . . . .
    20 00 20 00 20 00 20 00 20 00 20 00 20 00 20 00   . . . . . . . .
  backtrace:
    [] __save_stack_trace+0x17/0x1c
    [] create_object+0xcd/0x188
    [] kmemleak_alloc+0x1b/0x3c
    [] __kmalloc+0xdb/0xe8
    [] vc_do_resize+0x73/0x1e0
    [] vc_resize+0x15/0x18
    [] fbcon_init+0x1f9/0x2b8
    [] visual_init+0x9f/0xdc
    [] vc_allocate+0x7f/0xfc
    [] con_open+0x17/0x80
    [] tty_open+0x1f7/0x2e4
    [] chrdev_open+0x101/0x118
    [] __dentry_open+0x105/0x1cc
    [] nameidata_to_filp+0x2d/0x38
    [] do_filp_open+0x2c1/0x54c
    [] do_sys_open+0x3b/0xb4

Reported-by: Catalin Marinas 
Signed-off-by: Johannes Weiner 
Tested-by: Catalin Marinas 
Cc: Pekka Enberg 
Cc: Krzysztof Helt 
Tested-by: Dave Young 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds