]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
fbcon: fix locking harder
authorDave Airlie <airlied@gmail.com>
Fri, 25 Jan 2013 01:38:56 +0000 (11:38 +1000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 25 Apr 2013 19:25:49 +0000 (20:25 +0100)
commitc9d286ac3cc682902cb4072232bea7ac9d49bf91
treef26a15830479dbf0d143565b622a78fa6c915d68
parent095a3cac24ab4bc77ca12efd6198ca237282801e
fbcon: fix locking harder

commit 054430e773c9a1e26f38e30156eff02dedfffc17 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/vga/vga_switcheroo.c
drivers/video/console/fbcon.c
drivers/video/fbmem.c