Skip to content

Commit

Permalink
vt: fix issue when fbcon wants to takeover a second time.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Airlie authored and Greg Kroah-Hartman committed Jan 23, 2011
1 parent 1bae4ce commit c55c63c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/tty/vt/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit c55c63c

Please sign in to comment.