aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-01-07 09:57:41 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-22 19:15:00 -0800
commitc55c63c6539499379ab4a7e8a5c0f857351fb946 (patch)
treee9a607c2c47e22a020620c1e6abc95c962e46814 /drivers/tty
parent1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff)
downloadkernel_samsung_crespo-c55c63c6539499379ab4a7e8a5c0f857351fb946.zip
kernel_samsung_crespo-c55c63c6539499379ab4a7e8a5c0f857351fb946.tar.gz
kernel_samsung_crespo-c55c63c6539499379ab4a7e8a5c0f857351fb946.tar.bz2
vt: fix issue when fbcon wants to takeover a second time.
With framebuffer handover and multiple GPUs, we get into a position where the fbcon unbinds the vesafb framebuffer for GPU 1, but we still have a radeon framebuffer bound from GPU 0, so we don't unregister the console driver. Then when we tried to bind the new radeon framebuffer for GPU1 we never get to the bind call as we fail due to the console being registered already. This changes the return value to -EBUSY when the driver is already registered and continues to bind for -EBUSY. Signed-off-by: Dave Airlie <airlied@redhat.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/vt/vt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 76407ec..4f6ae05 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3545,7 +3545,7 @@ int register_con_driver(const struct consw *csw, int first, int last)
/* already registered */
if (con_driver->con == csw)
- retval = -EINVAL;
+ retval = -EBUSY;
}
if (retval)
@@ -3656,7 +3656,12 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)
int err;
err = register_con_driver(csw, first, last);
-
+ /* if we get an busy error we still want to bind the console driver
+ * and return success, as we may have unbound the console driver
+  * but not unregistered it.
+ */
+ if (err == -EBUSY)
+ err = 0;
if (!err)
bind_con_driver(csw, first, last, deflt);