From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Antonino A. Daplas" Subject: [PATCH RESEND 4/9] fbdev: Ignore VESA modes if framebuffer is disabled Date: Sun, 25 Feb 2007 18:17:08 +0800 Message-ID: <45E16224.8030309@gmail.com> Reply-To: linux-fbdev-devel@lists.sourceforge.net Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1HLGay-0006AS-PZ for linux-fbdev-devel@lists.sourceforge.net; Sun, 25 Feb 2007 02:27:08 -0800 Received: from nz-out-0506.google.com ([64.233.162.226]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1HLGax-0001zz-0R for linux-fbdev-devel@lists.sourceforge.net; Sun, 25 Feb 2007 02:27:08 -0800 Received: by nz-out-0506.google.com with SMTP id i11so1731052nzi for ; Sun, 25 Feb 2007 02:27:06 -0800 (PST) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-fbdev-devel-bounces@lists.sourceforge.net Errors-To: linux-fbdev-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: Linux Fbdev development list If the option vga= is added to the boot parameter, it will activate graphics mode, but without any framebuffer support, the user is left with an unusable display. Change the behavior such that the user is instead prompted for another mode (ala vga=ask). NOTE: People can always use vbetool to set a graphics mode if this is really desired, but the number of people doing this approaches zero. Signed-off-by: Antonino Daplas --- arch/i386/boot/video.S | 4 +++- arch/x86_64/boot/video.S | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S index 9101969..78573da 100644 --- a/arch/i386/boot/video.S +++ b/arch/i386/boot/video.S @@ -496,9 +496,11 @@ mode_set: cmpb $VIDEO_FIRST_V7>>8, %ah jz setv7 +#ifdef CONFIG_FB cmpb $VIDEO_FIRST_VESA>>8, %ah jnc check_vesa - +#endif + orb %ah, %ah jz setmenu diff --git a/arch/x86_64/boot/video.S b/arch/x86_64/boot/video.S index 6af75a7..d58aa0b 100644 --- a/arch/x86_64/boot/video.S +++ b/arch/x86_64/boot/video.S @@ -496,9 +496,11 @@ mode_set: cmpb $VIDEO_FIRST_V7>>8, %ah jz setv7 +#ifdef CONFIG_FB cmpb $VIDEO_FIRST_VESA>>8, %ah jnc check_vesa - +#endif + orb %ah, %ah jz setmenu ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV