On 06/04/14 16:44, lxnay@xxxxxxxxxxx wrote: > From: Fabio Erculiani <lxnay@xxxxxxxxxxx> > > This patch makes possible to ship kernels with both vesafb and uvesafb > in order to guarantee a smooth transition to uvesafb and cope with > potential incompatibiles introduced by uvesafb making possible to disable > it via cmdline. > > In case both vesafb and uvesafb are built-in, the kernel will try to > initialize both, which makes possible to select the wanted one using > either video=vesafb:... or video=uvesafb:.... > In this way, old distro installations will keep working as before while > new ones can adopt video=uvesafb. > > The behaviour does not change if uvesafb is built as a module. > --- > drivers/video/uvesafb.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c > index d428445..04c4742 100644 > --- a/drivers/video/uvesafb.c > +++ b/drivers/video/uvesafb.c > @@ -1957,6 +1957,10 @@ static int uvesafb_init(void) > > if (fb_get_options("uvesafb", &option)) > return -ENODEV; > + if (!option || !*option) > + /* if vesafb is enabled, this will make possible to fallback to it */ > + return -ENODEV; > + > uvesafb_setup(option); > #endif > err = cn_add_callback(&uvesafb_cn_id, "uvesafb", uvesafb_cn_callback); > I'm not familiar with vesa fbs, so I'd like to hear from other people if this change is ok. Cc'd a bunch of random people from git log. Reviewed-by, tested-by, acked-by from anyone? Tomi
Attachment:
signature.asc
Description: OpenPGP digital signature