fbcon: fix locking harder

Browse source

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>

...

This commit is contained in:

Dave Airlie 2013-01-25 11:38:56 +10:00 • committed by Dave Airlie

parent e93a9a8687

commit 054430e773

3 changed files with 13 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/gpu/vga/vga_switcheroo.c

View file

11

drivers/video/console/fbcon.c

View file

2

drivers/video/fbmem.c

View file