lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fbcon: fix situation where fbcon gets deinitialised and can't reinit.

Browse Source 
Situation as follow:
2 GPUs + vesafb + kms.

GPU 1 is primary, vesafb binds to it as fb0
radeon loads
GPU 0 loads as fb1
GPU 1 loads, vesafb gets kicked off which causes fb0 to unbind
console, which causes the dummy console to rebind.

this means fbcon_deinit gets called, which calls fbcon_exit
since the console isn't bound anymore and we set fbcon_has_exited.

GPU 1 creates a new fb0 which is primary and we want to be console.
fbcon_fb_registered gets called sets the primary up and calls set_con2fb_map,
however as fbcon_has_exited is set nothing further ever happens.

This patch bypasses the fbcon_has_exited and checks if the console is unbound,
if its unbound it calls the fbcon_takeover which calls the vt layer to
call the fbcon_startup method and everthing works.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Dave Airlie
2010-12-21 01:41:17 +00:00
committed by Paul Mundt
parent 4295f9bf74
commit 32b98bf875
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/console/fbcon.c
View File

@@ -823,10 +823,10 @@ static int set_con2fb_map(int unit, int newidx, int user)
if (oldidx == newidx) if (oldidx == newidx)
return 0; return 0;
if (!info || fbcon_has_exited) if (!info)
return -EINVAL; return -EINVAL;
if (!err && !search_for_mapped_con()) { if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
info_idx = newidx; info_idx = newidx;
return fbcon_takeover(0); return fbcon_takeover(0);
} }