fbcon: logo: disable logo at boot
Add logo.nologo kernel boot option to disable the logo in order to provide more screen space for kernel messages; especially useful when debugging and screen space is more critical. newport_con driver changes are untested. [akpm@linux-foundation.org: cleanups, coding-style fixes] Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
840bc9b093
commit
accaa24c49
@@ -98,14 +98,19 @@ static inline void newport_init_cmap(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void newport_show_logo(void)
|
||||
static struct linux_logo *newport_show_logo(void)
|
||||
{
|
||||
#ifdef CONFIG_LOGO_SGI_CLUT224
|
||||
const struct linux_logo *logo = fb_find_logo(8);
|
||||
const unsigned char *clut = logo->clut;
|
||||
const unsigned char *data = logo->data;
|
||||
const unsigned char *clut;
|
||||
const unsigned char *data;
|
||||
unsigned long i;
|
||||
|
||||
if (!logo)
|
||||
return NULL;
|
||||
*clut = logo->clut;
|
||||
*data = logo->data;
|
||||
|
||||
for (i = 0; i < logo->clutsize; i++) {
|
||||
newport_bfwait(npregs);
|
||||
newport_cmap_setaddr(npregs, i + 0x20);
|
||||
@@ -123,6 +128,8 @@ static void newport_show_logo(void)
|
||||
|
||||
for (i = 0; i < logo->width*logo->height; i++)
|
||||
npregs->go.hostrw0 = *data++ << 24;
|
||||
|
||||
return logo;
|
||||
#endif /* CONFIG_LOGO_SGI_CLUT224 */
|
||||
}
|
||||
|
||||
@@ -465,9 +472,10 @@ static int newport_switch(struct vc_data *vc)
|
||||
npregs->cset.topscan = 0x3ff;
|
||||
|
||||
if (!logo_drawn) {
|
||||
newport_show_logo();
|
||||
logo_drawn = 1;
|
||||
logo_active = 1;
|
||||
if (newport_show_logo()) {
|
||||
logo_drawn = 1;
|
||||
logo_active = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
Reference in New Issue
Block a user