fbcon: fix locking harder
authorDave Airlie <airlied@gmail.com>
Fri, 25 Jan 2013 01:38:56 +0000 (11:38 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 02:02:43 +0000 (12:02 +1000)
commit054430e773c9a1e26f38e30156eff02dedfffc17
tree9866f12c399f63de3ac285624226b19c0501b191
parente93a9a868792ad71cdd09d75e5a02d8067473c4e
fbcon: fix locking harder

Okay so Alan's patch handled the case where there was no registered fbcon,
however the other path entered in set_con2fb_map pit.

In there we called fbcon_takeover, but we also took the console lock in a couple
of places. So push the console lock out to the callers of set_con2fb_map,

this means fbmem and switcheroo needed to take the lock around the fb notifier
entry points that lead to this.

This should fix the efifb regression seen by Maarten.

Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Lu Hua <huax.lu@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/vga/vga_switcheroo.c
drivers/video/console/fbcon.c
drivers/video/fbmem.c