[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTinsVH2pyPfEjEfm9JD=D8P12Q0Y56y+ZJbpYc06@mail.gmail.com>
Date: Fri, 7 Jan 2011 09:57:41 +1000
From: Dave Airlie <airlied@...il.com>
To: Greg KH <greg@...ah.com>
Cc: linux-kernel@...r.kernel.org, Dave Airlie <airlied@...hat.com>,
Alan Cox <alan@...rguk.ukuu.org.uk>, Greg KH <greg@...e.de>
Subject: Re: [PATCH 2/3] vt: fix issue when fbcon wants to takeover a second time.
Hi Greg,
here is the patch I think you missed.
Dave.
On Tue, Dec 21, 2010 at 11:41 AM, Dave Airlie <airlied@...il.com> wrote:
> From: Dave Airlie <airlied@...hat.com>
>
> 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@...hat.com>
> Cc: Alan Cox <alan@...rguk.ukuu.org.uk>
> Cc: Greg KH <greg@...e.de>
> ---
> drivers/tty/vt/vt.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
> index a8ec48e..d781496 100644
> --- a/drivers/tty/vt/vt.c
> +++ b/drivers/tty/vt/vt.c
> @@ -3524,7 +3524,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)
> @@ -3635,7 +3635,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);
>
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists