[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <m1veeyrhn4.fsf@ebiederm.dsl.xmission.com>
Date: Fri, 11 May 2007 18:48:47 -0600
From: ebiederm@...ssion.com (Eric W. Biederman)
To: Gerd Hoffmann <kraxel@...hat.com>
Cc: lkml - Kernel Mailing List <linux-kernel@...r.kernel.org>,
Rusty Russell <rusty@...tcorp.com.au>, Andi Kleen <ak@...e.de>,
Alan <alan@...rguk.ukuu.org.uk>, Ingo Molnar <mingo@...e.hu>
Subject: Re: [patch] Refine SCREEN_INFO sanity check for vgacon initialization.
Gerd Hoffmann <kraxel@...hat.com> writes:
> Hi,
>
> Checking video mode field only to see whenever SCREEN_INFO is
> initialized is not enougth, in some cases it is zero although
> a vga card is present. Lets additionally check cols and lines.
Acked-by: "Eric W. Biederman" <ebiederm@...ssion.com>
>
> Updates f82af20e1a028e16b9bb11da081fa1148d40fa6a, should go
> into 2.6.22.
>
> please apply,
> Gerd
>
> Refine SCREEN_INFO sanity check for vgacon initialization.
>
> Checking video mode field only to see whenever SCREEN_INFO is
> initialized is not enougth, in some cases it is zero although
> a vga card is present. Lets additionally check cols and lines.
>
> Signed-off-by: Gerd Hoffmann <kraxel@...hat.com>
> Cc: Rusty Russell <rusty@...tcorp.com.au>
> Cc: Andi Kleen <ak@...e.de>
> Cc: Alan <alan@...rguk.ukuu.org.uk>
> Cc: Ingo Molnar <mingo@...e.hu>
> Cc: Eric W. Biederman <ebiederm@...ssion.com>
> ---
> drivers/video/console/vgacon.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> Index: vanilla-2.6.21-git11/drivers/video/console/vgacon.c
> ===================================================================
> --- vanilla-2.6.21-git11.orig/drivers/video/console/vgacon.c
> +++ vanilla-2.6.21-git11/drivers/video/console/vgacon.c
> @@ -368,9 +368,14 @@ static const char *vgacon_startup(void)
> #endif
> }
>
> + /* SCREEN_INFO initialized? */
> + if ((ORIG_VIDEO_MODE == 0) &&
> + (ORIG_VIDEO_LINES == 0) &&
> + (ORIG_VIDEO_COLS == 0))
> + goto no_vga;
> +
> /* VGA16 modes are not handled by VGACON */
> - if ((ORIG_VIDEO_MODE == 0x00) || /* SCREEN_INFO not initialized */
> - (ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
> + if ((ORIG_VIDEO_MODE == 0x0D) || /* 320x200/4 */
> (ORIG_VIDEO_MODE == 0x0E) || /* 640x200/4 */
> (ORIG_VIDEO_MODE == 0x10) || /* 640x350/4 */
> (ORIG_VIDEO_MODE == 0x12) || /* 640x480/4 */
-
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