From patchwork Wed Mar 24 14:14:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 48416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E5F0FB7CF1 for ; Thu, 25 Mar 2010 01:17:04 +1100 (EST) Received: from localhost ([127.0.0.1]:57641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuRNY-0004oM-LN for incoming@patchwork.ozlabs.org; Wed, 24 Mar 2010 10:16:16 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuRM4-0004nt-Q6 for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:14:44 -0400 Received: from [140.186.70.92] (port=52575 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuRLx-0004kT-15 for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:14:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuRLt-0000qu-Vs for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:14:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27946) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuRLt-0000qL-Nq for qemu-devel@nongnu.org; Wed, 24 Mar 2010 10:14:33 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2OEEWOo011092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Mar 2010 10:14:32 -0400 Received: from zweiblum.home.kraxel.org (vpn2-10-208.ams2.redhat.com [10.36.10.208]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2OEEV9A008891; Wed, 24 Mar 2010 10:14:31 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 56BDD7010F; Wed, 24 Mar 2010 15:14:30 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 24 Mar 2010 15:14:30 +0100 Message-Id: <1269440070-26788-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] update bochs vbe interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The bochs vbe interface got a new register a while back, which specifies the linear framebuffer size in 64k units. This patch adds support for the new register to qemu. With this patch applied vgabios 0.6c works with qemu. Signed-off-by: Gerd Hoffmann --- hw/vga.c | 3 ++- hw/vga_int.h | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 6a1a059..a5c6997 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1955,7 +1955,8 @@ void vga_common_reset(VGACommonState *s) #ifdef CONFIG_BOCHS_VBE s->vbe_index = 0; memset(s->vbe_regs, '\0', sizeof(s->vbe_regs)); - s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0; + s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5; + s->vbe_regs[VBE_DISPI_INDEX_VIDEO_MEMORY_64K] = s->vram_size / (64 * 1024); s->vbe_start_addr = 0; s->vbe_line_offset = 0; s->vbe_bank_mask = (s->vram_size >> 16) - 1; diff --git a/hw/vga_int.h b/hw/vga_int.h index 23a42ef..4b8fc74 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -47,13 +47,15 @@ #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 #define VBE_DISPI_INDEX_X_OFFSET 0x8 #define VBE_DISPI_INDEX_Y_OFFSET 0x9 -#define VBE_DISPI_INDEX_NB 0xa +#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa +#define VBE_DISPI_INDEX_NB 0xb #define VBE_DISPI_ID0 0xB0C0 #define VBE_DISPI_ID1 0xB0C1 #define VBE_DISPI_ID2 0xB0C2 #define VBE_DISPI_ID3 0xB0C3 #define VBE_DISPI_ID4 0xB0C4 +#define VBE_DISPI_ID5 0xB0C5 #define VBE_DISPI_DISABLED 0x00 #define VBE_DISPI_ENABLED 0x01