* [Qemu-devel] [VGABIOS PATCH 01/11] - use VBE LFB address from PCI base address if present (rewrite of the cirrus specific function in main vgabios code) - removed unnecessary spaces
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
@ 2010-09-21 17:07 ` Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 02/11] - added support for a lot more non-standard VBE modes (e.g. widescreen modes) - requires latest Bochs VBE code (16 MB video memory, VBE_DISPI_ID5, VRAM size in 64k pages stored in VBE register) - check if VBE mode is supported with current VRAM size Gerd Hoffmann
` (10 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Volker Ruppert, Gerd Hoffmann
From: Volker Ruppert <info@vruppert.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
clext.c | 51 ++-------------------------------------------------
vbe.c | 59 ++++++++++++++++++++++++++++++++---------------------------
vgabios.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 76 deletions(-)
diff --git a/clext.c b/clext.c
index c7a2ad0..b0b6834 100644
--- a/clext.c
+++ b/clext.c
@@ -948,7 +948,8 @@ cirrus_vesa_01h_3:
;; 32-bit LFB address
xor ax, ax
stosw
- call cirrus_get_lfb_addr
+ mov ax, #0x1013 ;; vendor Cirrus
+ call _pci_get_lfb_addr
stosw
or ax, ax
jz cirrus_vesa_01h_4
@@ -1293,54 +1294,6 @@ cgm_2:
cgm_3:
ret
- ; get LFB address
- ; out - ax:LFB address (high 16 bit)
- ;; NOTE - may be called in protected mode
-cirrus_get_lfb_addr:
- push cx
- push dx
- push eax
- xor cx, cx
- mov dl, #0x00
- call cirrus_pci_read
- cmp ax, #0xffff
- jz cirrus_get_lfb_addr_5
- cirrus_get_lfb_addr_3:
- mov dl, #0x00
- call cirrus_pci_read
- cmp ax, #0x1013 ;; cirrus
- jz cirrus_get_lfb_addr_4
- add cx, #0x8
- cmp cx, #0x200 ;; search bus #0 and #1
- jb cirrus_get_lfb_addr_3
- cirrus_get_lfb_addr_5:
- xor dx, dx ;; no LFB
- jmp cirrus_get_lfb_addr_6
- cirrus_get_lfb_addr_4:
- mov dl, #0x10 ;; I/O space #0
- call cirrus_pci_read
- test ax, #0xfff1
- jnz cirrus_get_lfb_addr_5
- shr eax, #16
- mov dx, ax ;; LFB address
- cirrus_get_lfb_addr_6:
- pop eax
- mov ax, dx
- pop dx
- pop cx
- ret
-
-cirrus_pci_read:
- mov eax, #0x00800000
- mov ax, cx
- shl eax, #8
- mov al, dl
- mov dx, #0xcf8
- out dx, eax
- add dl, #4
- in eax, dx
- ret
-
;; out - al:bytes per pixel
cirrus_get_bpp_bytes:
push dx
diff --git a/vbe.c b/vbe.c
index 6173ca0..92e3d0d 100644
--- a/vbe.c
+++ b/vbe.c
@@ -766,9 +766,9 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
Bit16u cur_mode=0;
Bit16u cur_ptr=34;
ModeInfoListItem *cur_info=&mode_info_list;
-
+
status = read_word(ss, AX);
-
+
#ifdef DEBUG
printf("VBE vbe_biosfn_return_vbe_info ES%x DI%x AX%x\n",ES,DI,status);
#endif
@@ -784,7 +784,7 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
(vbe_info_block.VbeSignature[1] == 'B') &&
(vbe_info_block.VbeSignature[2] == 'E') &&
(vbe_info_block.VbeSignature[3] == '2')) ||
-
+
((vbe_info_block.VbeSignature[0] == 'V') &&
(vbe_info_block.VbeSignature[1] == 'E') &&
(vbe_info_block.VbeSignature[2] == 'S') &&
@@ -796,20 +796,20 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
#endif
}
#endif
-
+
// VBE Signature
vbe_info_block.VbeSignature[0] = 'V';
vbe_info_block.VbeSignature[1] = 'E';
vbe_info_block.VbeSignature[2] = 'S';
vbe_info_block.VbeSignature[3] = 'A';
-
+
// VBE Version supported
vbe_info_block.VbeVersion = 0x0200;
-
+
// OEM String
vbe_info_block.OemStringPtr_Seg = 0xc000;
vbe_info_block.OemStringPtr_Off = &vbebios_copyright;
-
+
// Capabilities
vbe_info_block.Capabilities[0] = VBE_CAPABILITY_8BIT_DAC;
vbe_info_block.Capabilities[1] = 0;
@@ -824,7 +824,7 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
vbe_info_block.TotalMemory = VBE_TOTAL_VIDEO_MEMORY_DIV_64K;
if (vbe2_info)
- {
+ {
// OEM Stuff
vbe_info_block.OemSoftwareRev = VBE_OEM_SOFTWARE_REV;
vbe_info_block.OemVendorNamePtr_Seg = 0xc000;
@@ -837,12 +837,12 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
// copy updates in vbe_info_block back
memcpyb(ES, DI, ss, &vbe_info_block, sizeof(vbe_info_block));
}
- else
- {
+ else
+ {
// copy updates in vbe_info_block back (VBE 1.x compatibility)
memcpyb(ES, DI, ss, &vbe_info_block, 256);
- }
-
+ }
+
do
{
if ((cur_info->info.XResolution <= dispi_get_max_xres()) &&
@@ -860,7 +860,7 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
}
cur_info++;
} while (cur_info->mode != VBE_VESA_MODE_END_OF_LIST);
-
+
// Add vesa mode list terminator
write_word(ES, DI + cur_ptr, cur_info->mode);
@@ -888,32 +888,37 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
ModeInfoBlock info;
ModeInfoListItem *cur_info;
Boolean using_lfb;
+ Bit16u lfb_addr;
#ifdef DEBUG
printf("VBE vbe_biosfn_return_mode_information ES%x DI%x CX%x\n",ES,DI,CX);
#endif
using_lfb=((CX & VBE_MODE_LINEAR_FRAME_BUFFER) == VBE_MODE_LINEAR_FRAME_BUFFER);
-
+
CX = (CX & 0x1ff);
-
+
cur_info = mode_info_find_mode(CX, using_lfb, &cur_info);
if (cur_info != 0)
{
#ifdef DEBUG
printf("VBE found mode %x\n",CX);
-#endif
+#endif
memsetb(ss, &info, 0, sizeof(ModeInfoBlock));
memcpyb(ss, &info, 0xc000, &(cur_info->info), sizeof(ModeInfoBlockCompact));
if (using_lfb) {
info.NumberOfBanks = 1;
}
+ lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor
+ if (lfb_addr > 0) {
+ info.PhysBasePtr = ((Bit32u)lfb_addr << 16);
+ }
if (info.WinAAttributes & VBE_WINDOW_ATTRIBUTE_RELOCATABLE) {
info.WinFuncPtr = 0xC0000000UL;
*(Bit16u *)&(info.WinFuncPtr) = (Bit16u)(dispi_set_bank_farcall);
}
-
+
result = 0x4f;
}
else
@@ -923,7 +928,7 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
#endif
result = 0x100;
}
-
+
if (result == 0x4f)
{
// copy updates in mode_info_block back
@@ -960,21 +965,21 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
BX = (BX & 0x1ff);
//result=read_word(ss,AX);
-
+
// check for non vesa mode
if (BX<VBE_MODE_VESA_DEFINED)
{
Bit8u mode;
-
+
dispi_set_enable(VBE_DISPI_DISABLED);
// call the vgabios in order to set the video mode
// this allows for going back to textmode with a VBE call (some applications expect that to work)
-
+
mode=(BX & 0xff);
biosfn_set_video_mode(mode);
result = 0x4f;
}
-
+
cur_info = mode_info_find_mode(BX, using_lfb, &cur_info);
if (cur_info != 0)
@@ -986,7 +991,7 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
cur_info->info.YResolution,
cur_info->info.BitsPerPixel);
#endif
-
+
// first disable current mode (when switching between vesa modi)
dispi_set_enable(VBE_DISPI_DISABLED);
@@ -1005,15 +1010,15 @@ Bit16u *AX;Bit16u BX; Bit16u ES;Bit16u DI;
write_word(BIOSMEM_SEG,BIOSMEM_VBE_MODE,BX);
write_byte(BIOSMEM_SEG,BIOSMEM_VIDEO_CTL,(0x60 | no_clear));
- result = 0x4f;
+ result = 0x4f;
}
else
{
#ifdef DEBUG
printf("VBE *NOT* found mode %x\n" , BX);
-#endif
+#endif
result = 0x100;
-
+
// FIXME: redirect non VBE modi to normal VGA bios operation
// (switch back to VGA mode
if (BX == 3)
@@ -1089,7 +1094,7 @@ void vbe_biosfn_restore_video_state(ES, BX)
enable = read_word(ES, BX);
BX += 2;
-
+
if (!(enable & VBE_DISPI_ENABLED)) {
outw(VBE_DISPI_IOPORT_INDEX,VBE_DISPI_INDEX_ENABLE);
outw(VBE_DISPI_IOPORT_DATA, enable);
diff --git a/vgabios.c b/vgabios.c
index e6fe2a0..fbc3588 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -3830,6 +3830,64 @@ void printf(s)
}
#endif
+ASM_START
+ ; get LFB address from PCI
+ ; in - ax: PCI device vendor
+ ; out - ax: LFB address (high 16 bit)
+ ;; NOTE - may be called in protected mode
+_pci_get_lfb_addr:
+ push bx
+ push cx
+ push dx
+ push eax
+ mov bx, ax
+ xor cx, cx
+ mov dl, #0x00
+ call pci_read_reg
+ cmp ax, #0xffff
+ jz pci_get_lfb_addr_5
+ pci_get_lfb_addr_3:
+ mov dl, #0x00
+ call pci_read_reg
+ cmp ax, bx ;; check vendor
+ jz pci_get_lfb_addr_4
+ add cx, #0x8
+ cmp cx, #0x200 ;; search bus #0 and #1
+ jb pci_get_lfb_addr_3
+ pci_get_lfb_addr_5:
+ xor dx, dx ;; no LFB
+ jmp pci_get_lfb_addr_6
+ pci_get_lfb_addr_4:
+ mov dl, #0x10 ;; I/O space #0
+ call pci_read_reg
+ test ax, #0xfff1
+ jnz pci_get_lfb_addr_5
+ shr eax, #16
+ mov dx, ax ;; LFB address
+ pci_get_lfb_addr_6:
+ pop eax
+ mov ax, dx
+ pop dx
+ pop cx
+ pop bx
+ ret
+
+ ; read PCI register
+ ; in - cx: device/function
+ ; in - dl: register
+ ; out - eax: value
+pci_read_reg:
+ mov eax, #0x00800000
+ mov ax, cx
+ shl eax, #8
+ mov al, dl
+ mov dx, #0xcf8
+ out dx, eax
+ add dl, #4
+ in eax, dx
+ ret
+ASM_END
+
#ifdef VBE
#include "vbe.c"
#endif
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 02/11] - added support for a lot more non-standard VBE modes (e.g. widescreen modes) - requires latest Bochs VBE code (16 MB video memory, VBE_DISPI_ID5, VRAM size in 64k pages stored in VBE register) - check if VBE mode is supported with current VRAM size
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 01/11] - use VBE LFB address from PCI base address if present (rewrite of the cirrus specific function in main vgabios code) - removed unnecessary spaces Gerd Hoffmann
@ 2010-09-21 17:07 ` Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 03/11] - preparing for release 0.6c Gerd Hoffmann
` (9 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Volker Ruppert, Gerd Hoffmann
From: Volker Ruppert <info@vruppert.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
vbe.c | 31 ++++++++++++++++++------
vbe.h | 70 ++++++++++++++++++++++++++++--------------------------
vbetables-gen.c | 43 +++++++++++++++++++++++++--------
3 files changed, 91 insertions(+), 53 deletions(-)
diff --git a/vbe.c b/vbe.c
index 92e3d0d..ecff90d 100644
--- a/vbe.c
+++ b/vbe.c
@@ -38,8 +38,6 @@
#include "vbe.h"
#include "vbetables.h"
-#define VBE_TOTAL_VIDEO_MEMORY_DIV_64K (VBE_DISPI_TOTAL_VIDEO_MEMORY_MB*1024/64)
-
// The current OEM Software Revision of this VBE Bios
#define VBE_OEM_SOFTWARE_REV 0x0002;
@@ -715,7 +713,7 @@ vbe_init:
mov [bx], al
pop bx
pop ds
- mov ax, # VBE_DISPI_ID4
+ mov ax, # VBE_DISPI_ID5
call dispi_set_id
no_vbe_interface:
#if defined(USE_BX_INFO) || defined(DEBUG)
@@ -742,7 +740,19 @@ no_vbe_flag:
mov ds, ax
mov si, #_no_vbebios_info_string
jmp _display_string
-ASM_END
+
+; helper function for memory size calculation
+
+lmulul:
+ and eax, #0x0000FFFF
+ shl ebx, #16
+ or eax, ebx
+ SEG SS
+ mul eax, dword ptr [di]
+ mov ebx, eax
+ shr ebx, #16
+ ret
+ASM_END
/** Function 00h - Return VBE Controller Information
*
@@ -765,6 +775,7 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
Bit16u vbe2_info;
Bit16u cur_mode=0;
Bit16u cur_ptr=34;
+ Bit16u size_64k;
ModeInfoListItem *cur_info=&mode_info_list;
status = read_word(ss, AX);
@@ -820,8 +831,9 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
vbe_info_block.VideoModePtr_Seg= ES ;
vbe_info_block.VideoModePtr_Off= DI + 34;
- // VBE Total Memory (in 64b blocks)
- vbe_info_block.TotalMemory = VBE_TOTAL_VIDEO_MEMORY_DIV_64K;
+ // VBE Total Memory (in 64k blocks)
+ outw(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_VIDEO_MEMORY_64K);
+ vbe_info_block.TotalMemory = inw(VBE_DISPI_IOPORT_DATA);
if (vbe2_info)
{
@@ -845,8 +857,11 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
do
{
+ size_64k = (Bit16u)((Bit32u)cur_info->info.XResolution * cur_info->info.XResolution * cur_info->info.BitsPerPixel) >> 19;
+
if ((cur_info->info.XResolution <= dispi_get_max_xres()) &&
- (cur_info->info.BitsPerPixel <= dispi_get_max_bpp())) {
+ (cur_info->info.BitsPerPixel <= dispi_get_max_bpp()) &&
+ (size_64k <= vbe_info_block.TotalMemory)) {
#ifdef DEBUG
printf("VBE found mode %x => %x\n", cur_info->mode,cur_mode);
#endif
@@ -855,7 +870,7 @@ Bit16u *AX;Bit16u ES;Bit16u DI;
cur_ptr+=2;
} else {
#ifdef DEBUG
- printf("VBE mode %x (xres=%x / bpp=%02x) not supported by display\n", cur_info->mode,cur_info->info.XResolution,cur_info->info.BitsPerPixel);
+ printf("VBE mode %x (xres=%x / bpp=%02x) not supported \n", cur_info->mode,cur_info->info.XResolution,cur_info->info.BitsPerPixel);
#endif
}
cur_info++;
diff --git a/vbe.h b/vbe.h
index 60434ac..72cb045 100644
--- a/vbe.h
+++ b/vbe.h
@@ -275,39 +275,41 @@ typedef struct ModeInfoListItem
// like 0xE0000000
- #define VBE_DISPI_BANK_ADDRESS 0xA0000
- #define VBE_DISPI_BANK_SIZE_KB 64
-
- #define VBE_DISPI_MAX_XRES 1024
- #define VBE_DISPI_MAX_YRES 768
-
- #define VBE_DISPI_IOPORT_INDEX 0x01CE
- #define VBE_DISPI_IOPORT_DATA 0x01CF
-
- #define VBE_DISPI_INDEX_ID 0x0
- #define VBE_DISPI_INDEX_XRES 0x1
- #define VBE_DISPI_INDEX_YRES 0x2
- #define VBE_DISPI_INDEX_BPP 0x3
- #define VBE_DISPI_INDEX_ENABLE 0x4
- #define VBE_DISPI_INDEX_BANK 0x5
- #define VBE_DISPI_INDEX_VIRT_WIDTH 0x6
- #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7
- #define VBE_DISPI_INDEX_X_OFFSET 0x8
- #define VBE_DISPI_INDEX_Y_OFFSET 0x9
-
- #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_DISABLED 0x00
- #define VBE_DISPI_ENABLED 0x01
- #define VBE_DISPI_GETCAPS 0x02
- #define VBE_DISPI_8BIT_DAC 0x20
- #define VBE_DISPI_LFB_ENABLED 0x40
- #define VBE_DISPI_NOCLEARMEM 0x80
-
- #define VBE_DISPI_LFB_PHYSICAL_ADDRESS 0xE0000000
+ #define VBE_DISPI_BANK_ADDRESS 0xA0000
+ #define VBE_DISPI_BANK_SIZE_KB 64
+
+ #define VBE_DISPI_MAX_XRES 2560
+ #define VBE_DISPI_MAX_YRES 1600
+
+ #define VBE_DISPI_IOPORT_INDEX 0x01CE
+ #define VBE_DISPI_IOPORT_DATA 0x01CF
+
+ #define VBE_DISPI_INDEX_ID 0x0
+ #define VBE_DISPI_INDEX_XRES 0x1
+ #define VBE_DISPI_INDEX_YRES 0x2
+ #define VBE_DISPI_INDEX_BPP 0x3
+ #define VBE_DISPI_INDEX_ENABLE 0x4
+ #define VBE_DISPI_INDEX_BANK 0x5
+ #define VBE_DISPI_INDEX_VIRT_WIDTH 0x6
+ #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_VIDEO_MEMORY_64K 0xa
+
+ #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
+ #define VBE_DISPI_GETCAPS 0x02
+ #define VBE_DISPI_8BIT_DAC 0x20
+ #define VBE_DISPI_LFB_ENABLED 0x40
+ #define VBE_DISPI_NOCLEARMEM 0x80
+
+ #define VBE_DISPI_LFB_PHYSICAL_ADDRESS 0xE0000000
#endif
diff --git a/vbetables-gen.c b/vbetables-gen.c
index 7014a16..550935a 100644
--- a/vbetables-gen.c
+++ b/vbetables-gen.c
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <stdio.h>
-#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 8
+#define VBE_DISPI_TOTAL_VIDEO_MEMORY_MB 16
typedef struct {
int width;
@@ -41,20 +41,41 @@ ModeInfo modes[] = {
{ 1600, 1200, 16 , 0x11E},
{ 1600, 1200, 24 , 0x11F},
- /* BOCHS/PLE, 86 'own' mode numbers */
-{ 320, 200, 32 , 0x140},
-{ 640, 400, 32 , 0x141},
-{ 640, 480, 32 , 0x142},
-{ 800, 600, 32 , 0x143},
-{ 1024, 768, 32 , 0x144},
-{ 1280, 1024, 32 , 0x145},
-{ 320, 200, 8 , 0x146},
-{ 1600, 1200, 32 , 0x147},
-{ 1152, 864, 8 , 0x148},
+ /* BOCHS/PLEX86 'own' mode numbers */
+{ 320, 200, 32 , 0x140},
+{ 640, 400, 32 , 0x141},
+{ 640, 480, 32 , 0x142},
+{ 800, 600, 32 , 0x143},
+{ 1024, 768, 32 , 0x144},
+{ 1280, 1024, 32 , 0x145},
+{ 320, 200, 8 , 0x146},
+{ 1600, 1200, 32 , 0x147},
+{ 1152, 864, 8 , 0x148},
{ 1152, 864, 15 , 0x149},
{ 1152, 864, 16 , 0x14a},
{ 1152, 864, 24 , 0x14b},
{ 1152, 864, 32 , 0x14c},
+{ 1280, 800, 16 , 0x178},
+{ 1280, 800, 24 , 0x179},
+{ 1280, 800, 32 , 0x17a},
+{ 1280, 960, 16 , 0x17b},
+{ 1280, 960, 24 , 0x17c},
+{ 1280, 960, 32 , 0x17d},
+{ 1440, 900, 16 , 0x17e},
+{ 1440, 900, 24 , 0x17f},
+{ 1440, 900, 32 , 0x180},
+{ 1400, 1050, 16 , 0x181},
+{ 1400, 1050, 24 , 0x182},
+{ 1400, 1050, 32 , 0x183},
+{ 1680, 1050, 16 , 0x184},
+{ 1680, 1050, 24 , 0x185},
+{ 1680, 1050, 32 , 0x186},
+{ 1920, 1200, 16 , 0x187},
+{ 1920, 1200, 24 , 0x188},
+{ 1920, 1200, 32 , 0x189},
+{ 2560, 1600, 16 , 0x18a},
+{ 2560, 1600, 24 , 0x18b},
+{ 2560, 1600, 32 , 0x18c},
{ 0, },
};
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 03/11] - preparing for release 0.6c
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 01/11] - use VBE LFB address from PCI base address if present (rewrite of the cirrus specific function in main vgabios code) - removed unnecessary spaces Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 02/11] - added support for a lot more non-standard VBE modes (e.g. widescreen modes) - requires latest Bochs VBE code (16 MB video memory, VBE_DISPI_ID5, VRAM size in 64k pages stored in VBE register) - check if VBE mode is supported with current VRAM size Gerd Hoffmann
@ 2010-09-21 17:07 ` Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 04/11] - biosfn_write_teletype: fixed attribute when scrolling in text mode Gerd Hoffmann
` (8 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Volker Ruppert, Gerd Hoffmann
From: Volker Ruppert <info@vruppert.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ChangeLog | 35 +++++++++++++++++++++++++++++++++++
README | 6 ++++++
2 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75be5bd..35bf00a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2009-01-25 16:46 vruppert
+
+ * vbe.c (1.62), vbe.h (1.28), vbetables-gen.c (1.5):
+
+ - added support for a lot more non-standard VBE modes (e.g. widescreen modes)
+ - requires latest Bochs VBE code (16 MB video memory, VBE_DISPI_ID5, VRAM size
+ in 64k pages stored in VBE register)
+ - check if VBE mode is supported with current VRAM size
+
+2009-01-24 11:02 vruppert
+
+ * clext.c (1.14), vbe.c (1.61), vgabios.c (1.68):
+
+ - use VBE LFB address from PCI base address if present (rewrite of the cirrus
+ specific function in main vgabios code)
+ - removed unnecessary spaces
+
+2008-12-14 09:29 vruppert
+
+ * clext.c (1.13):
+
+ - added DPMS support to cirrus vgabios (patch from Gleb Natapov)
+
+2008-05-30 17:28 vruppert
+
+ * README (1.16):
+
+ - updated for release 0.6b
+
+2008-05-22 12:55 vruppert
+
+ * ChangeLog (1.27), README (1.15):
+
+ - preparations for release 0.6b
+
2008-05-11 08:40 vruppert
* biossums.c (1.6):
diff --git a/README b/README
index 90141d4..ce67aeb 100644
--- a/README
+++ b/README
@@ -90,6 +90,12 @@ For any information on qemu, visit the website http://fabrice.bellard.free.fr/qe
History
-------
+vgabios-0.6c : not yet released
+ - Volker
+ . added DPMS support to cirrus vgabios (patch from Gleb Natapov)
+ . use VBE LFB address from PCI base address if present
+ . added support for a lot more non-standard VBE modes (e.g. widescreen modes)
+
vgabios-0.6b : May 30 2008
- Volker
. added PCI data structure for the Cirrus VGABIOS images
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 04/11] - biosfn_write_teletype: fixed attribute when scrolling in text mode
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (2 preceding siblings ...)
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 03/11] - preparing for release 0.6c Gerd Hoffmann
@ 2010-09-21 17:07 ` Gerd Hoffmann
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 05/11] - updates for release 0.6c Gerd Hoffmann
` (7 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Volker Ruppert, Gerd Hoffmann
From: Volker Ruppert <info@vruppert.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
vgabios.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vgabios.c b/vgabios.c
index fbc3588..ea3aae8 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -2039,7 +2039,9 @@ Bit8u car;Bit8u page;Bit8u attr;Bit8u flag;
{
if(vga_modes[line].class==TEXT)
{
- biosfn_scroll(0x01,0x07,0,0,nbrows-1,nbcols-1,page,SCROLL_UP);
+ address=SCREEN_MEM_START(nbcols,nbrows,page)+(xcurs+(ycurs-1)*nbcols)*2;
+ attr=read_byte(vga_modes[line].sstart,address+1);
+ biosfn_scroll(0x01,attr,0,0,nbrows-1,nbcols-1,page,SCROLL_UP);
}
else
{
@@ -2047,7 +2049,7 @@ Bit8u car;Bit8u page;Bit8u attr;Bit8u flag;
}
ycurs-=1;
}
-
+
// Set the cursor for the page
cursor=ycurs; cursor<<=8; cursor+=xcurs;
biosfn_set_cursor_pos(page,cursor);
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 05/11] - updates for release 0.6c
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (3 preceding siblings ...)
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 04/11] - biosfn_write_teletype: fixed attribute when scrolling in text mode Gerd Hoffmann
@ 2010-09-21 17:07 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 06/11] Makefile cleanup Gerd Hoffmann
` (6 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:07 UTC (permalink / raw)
To: qemu-devel; +Cc: Volker Ruppert, Gerd Hoffmann
From: Volker Ruppert <info@vruppert.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ChangeLog | 12 ++++++++++++
README | 3 ++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 35bf00a..dbaed5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-07 20:18 vruppert
+
+ * vgabios.c (1.69):
+
+ - biosfn_write_teletype: fixed attribute when scrolling in text mode
+
+2009-04-06 20:17 vruppert
+
+ * ChangeLog (1.28), README (1.17):
+
+ - preparing for release 0.6c
+
2009-01-25 16:46 vruppert
* vbe.c (1.62), vbe.h (1.28), vbetables-gen.c (1.5):
diff --git a/README b/README
index ce67aeb..c68b573 100644
--- a/README
+++ b/README
@@ -90,11 +90,12 @@ For any information on qemu, visit the website http://fabrice.bellard.free.fr/qe
History
-------
-vgabios-0.6c : not yet released
+vgabios-0.6c : Apr 08 2009
- Volker
. added DPMS support to cirrus vgabios (patch from Gleb Natapov)
. use VBE LFB address from PCI base address if present
. added support for a lot more non-standard VBE modes (e.g. widescreen modes)
+ . minor bugfixes
vgabios-0.6b : May 30 2008
- Volker
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 06/11] Makefile cleanup
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (4 preceding siblings ...)
2010-09-21 17:07 ` [Qemu-devel] [VGABIOS PATCH 05/11] - updates for release 0.6c Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 07/11] Add defines for PCI IDs Gerd Hoffmann
` (5 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Use a single rule for building bios binaries.
Use target specific variables to set compile flags.
This makes it more obvious what the differences between the versions
are. It also makes it easier to add new bios binaries with slightly
different settings.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 76 +++++++++++++++++++++++++++----------------------------------
1 files changed, 34 insertions(+), 42 deletions(-)
diff --git a/Makefile b/Makefile
index 00e8c66..c3c744c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,8 +16,7 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
all: bios cirrus-bios
-
-bios: biossums vgabios.bin vgabios.debug.bin
+bios: vgabios.bin vgabios.debug.bin
cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
@@ -27,6 +26,39 @@ clean:
dist-clean: clean
+# source files
+VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
+VBE_FILES := vbe.h vbe.c vbetables.h
+
+# build flags
+vgabios.bin : VGAFLAGS := -DVBE
+vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
+vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
+vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
+
+# dist names
+vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
+vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
+vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
+vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
+
+# dependencies
+vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
+vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
+
+# build rule
+%.bin:
+ $(GCC) -E -P vgabios.c $(VGABIOS_VERS) $(VGAFLAGS) $(VGABIOS_DATE) > _$*_.c
+ $(BCC) -o $*.s -C-c -D__i86__ -S -0 _$*_.c
+ sed -e 's/^\.text//' -e 's/^\.data//' $*.s > _$*_.s
+ $(AS86) _$*_.s -b $*.bin -u -w- -g -0 -j -O -l $*.txt
+ rm -f _$*_.s _$*_.c $*.s
+ mv $*.bin $(DISTNAME)
+ ./biossums $(DISTNAME)
+ ls -l $(DISTNAME)
+
release:
VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
/bin/rm -f *.o *.s *.ld86 \
@@ -37,46 +69,6 @@ release:
cp VGABIOS-lgpl-latest.cirrus.debug.bin ../$(RELEASE).cirrus.debug.bin
tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/
-vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
- $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
- $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
- rm -f _vgabios_.s _vgabios_.c vgabios.s
- mv vgabios.bin VGABIOS-lgpl-latest.bin
- ./biossums VGABIOS-lgpl-latest.bin
- ls -l VGABIOS-lgpl-latest.bin
-
-vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
- $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
- $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
- rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
- mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
- ./biossums VGABIOS-lgpl-latest.debug.bin
- ls -l VGABIOS-lgpl-latest.debug.bin
-
-vgabios-cirrus.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
- $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
- $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios.cirrus.txt
- rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
- mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
- ./biossums VGABIOS-lgpl-latest.cirrus.bin
- ls -l VGABIOS-lgpl-latest.cirrus.bin
-
-vgabios-cirrus.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
- $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
- $(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios.cirrus.debug.txt
- rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
- mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
- ./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
- ls -l VGABIOS-lgpl-latest.cirrus.debug.bin
-
biossums: biossums.c
$(CC) -o biossums biossums.c
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 07/11] Add defines for PCI IDs.
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (5 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 06/11] Makefile cleanup Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 08/11] Add qemu stdvga pci bios Gerd Hoffmann
` (4 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
This patch allows to set PCI vendor and device IDs using defines
(PCI_VID and PCI_DID). Use it for vgabios.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 4 ++--
vbe.c | 6 +++++-
vgabios.c | 5 +++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c3c744c..d440b93 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
VBE_FILES := vbe.h vbe.c vbetables.h
# build flags
-vgabios.bin : VGAFLAGS := -DVBE
-vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
+vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
+vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
diff --git a/vbe.c b/vbe.c
index ecff90d..1fab2f9 100644
--- a/vbe.c
+++ b/vbe.c
@@ -925,7 +925,11 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
if (using_lfb) {
info.NumberOfBanks = 1;
}
- lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor
+#ifdef PCI_VID
+ lfb_addr = pci_get_lfb_addr(PCI_VID);
+#else
+ lfb_addr = 0;
+#endif
if (lfb_addr > 0) {
info.PhysBasePtr = ((Bit32u)lfb_addr << 16);
}
diff --git a/vgabios.c b/vgabios.c
index ea3aae8..2e8b5d7 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -210,8 +210,13 @@ vgabios_pci_data:
.word 0x1013
.word 0x00b8 // CLGD5446
#else
+#ifdef PCI_VID
+.word PCI_VID
+.word PCI_DID
+#else
#error "Unknown PCI vendor and device id"
#endif
+#endif
.word 0 // reserved
.word 0x18 // dlen
.byte 0 // revision
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 08/11] Add qemu stdvga pci bios
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (6 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 07/11] Add defines for PCI IDs Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 09/11] update pci_get_lfb_addr for vmware vga Gerd Hoffmann
` (3 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add PCI vgabios for the qemu standard vga (1234:1111).
Name it vgabios-stdvga.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index d440b93..58f064e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,14 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"`
VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
-all: bios cirrus-bios
+all: bios cirrus-bios stdvga-bios
bios: vgabios.bin vgabios.debug.bin
cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
@@ -35,18 +37,24 @@ vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
+vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111
+vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG
# dist names
vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
+vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
+vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
# dependencies
vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
+vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
# build rule
%.bin:
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 09/11] update pci_get_lfb_addr for vmware vga
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (7 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 08/11] Add qemu stdvga pci bios Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 10/11] Add qemu vmware vga pci bios Gerd Hoffmann
` (2 subsequent siblings)
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
vmware vga has the framebuffer at pci region 1 not 0. This patch makes
pci_get_lfb_addr check region 1 too. It also gives names to the
numbered labels to make the code more readable.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
vgabios.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/vgabios.c b/vgabios.c
index 2e8b5d7..c1e312b 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -3852,26 +3852,31 @@ _pci_get_lfb_addr:
mov dl, #0x00
call pci_read_reg
cmp ax, #0xffff
- jz pci_get_lfb_addr_5
- pci_get_lfb_addr_3:
+ jz pci_get_lfb_addr_fail
+ pci_get_lfb_addr_next_dev:
mov dl, #0x00
call pci_read_reg
cmp ax, bx ;; check vendor
- jz pci_get_lfb_addr_4
+ jz pci_get_lfb_addr_found
add cx, #0x8
cmp cx, #0x200 ;; search bus #0 and #1
- jb pci_get_lfb_addr_3
- pci_get_lfb_addr_5:
+ jb pci_get_lfb_addr_next_dev
+ pci_get_lfb_addr_fail:
xor dx, dx ;; no LFB
- jmp pci_get_lfb_addr_6
- pci_get_lfb_addr_4:
+ jmp pci_get_lfb_addr_return
+ pci_get_lfb_addr_found:
mov dl, #0x10 ;; I/O space #0
call pci_read_reg
test ax, #0xfff1
- jnz pci_get_lfb_addr_5
+ jz pci_get_lfb_addr_success
+ mov dl, #0x14 ;; I/O space #1
+ call pci_read_reg
+ test ax, #0xfff1
+ jnz pci_get_lfb_addr_fail
+ pci_get_lfb_addr_success:
shr eax, #16
mov dx, ax ;; LFB address
- pci_get_lfb_addr_6:
+ pci_get_lfb_addr_return:
pop eax
mov ax, dx
pop dx
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 10/11] Add qemu vmware vga pci bios
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (8 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 09/11] update pci_get_lfb_addr for vmware vga Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 11/11] Add qemu qxl " Gerd Hoffmann
2010-11-01 16:02 ` [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add PCI vgabios for the qemu vmeare vga (15ad:0405).
Name it vgabios-vmware.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 58f064e..2a093e8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"`
VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
-all: bios cirrus-bios stdvga-bios
+all: bios cirrus-bios stdvga-bios vmware-bios
bios: vgabios.bin vgabios.debug.bin
@@ -22,6 +22,8 @@ cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+vmware-bios: vgabios-vmware.bin vgabios-vmware.debug.bin
+
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
@@ -39,6 +41,8 @@ vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111
vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG
+vgabios-vmware.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405
+vgabios-vmware.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405 -DDEBUG
# dist names
vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
@@ -47,6 +51,8 @@ vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
+vgabios-vmware.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.bin
+vgabios-vmware.debug.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.debug.bin
# dependencies
vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
@@ -55,6 +61,8 @@ vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-vmware.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-vmware.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
# build rule
%.bin:
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] [VGABIOS PATCH 11/11] Add qemu qxl vga pci bios
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (9 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 10/11] Add qemu vmware vga pci bios Gerd Hoffmann
@ 2010-09-21 17:08 ` Gerd Hoffmann
2010-11-01 16:02 ` [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
11 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-09-21 17:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Add PCI vgabios for the qemu qxl vga (1b36:0100).
Name it vgabios-qxl.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 2a093e8..578721a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"`
VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
-all: bios cirrus-bios stdvga-bios vmware-bios
+all: bios cirrus-bios stdvga-bios vmware-bios qxl-bios
bios: vgabios.bin vgabios.debug.bin
@@ -24,6 +24,8 @@ stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
vmware-bios: vgabios-vmware.bin vgabios-vmware.debug.bin
+qxl-bios: vgabios-qxl.bin vgabios-qxl.debug.bin
+
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
@@ -43,6 +45,8 @@ vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DI
vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG
vgabios-vmware.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405
vgabios-vmware.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405 -DDEBUG
+vgabios-qxl.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1b36 -DPCI_DID=0x0100
+vgabios-qxl.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1b36 -DPCI_DID=0x0100 -DDEBUG
# dist names
vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
@@ -53,6 +57,8 @@ vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
vgabios-vmware.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.bin
vgabios-vmware.debug.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.debug.bin
+vgabios-qxl.bin : DISTNAME := VGABIOS-lgpl-latest.qxl.bin
+vgabios-qxl.debug.bin : DISTNAME := VGABIOS-lgpl-latest.qxl.debug.bin
# dependencies
vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
@@ -63,6 +69,8 @@ vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-vmware.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-vmware.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-qxl.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-qxl.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
# build rule
%.bin:
--
1.7.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update
2010-09-21 17:07 [Qemu-devel] [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
` (10 preceding siblings ...)
2010-09-21 17:08 ` [Qemu-devel] [VGABIOS PATCH 11/11] Add qemu qxl " Gerd Hoffmann
@ 2010-11-01 16:02 ` Gerd Hoffmann
2010-11-01 18:00 ` Anthony Liguori
11 siblings, 1 reply; 15+ messages in thread
From: Gerd Hoffmann @ 2010-11-01 16:02 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
On 09/21/10 19:07, Gerd Hoffmann wrote:
> Hi,
>
> This patch series updates the vgabios. The first five patches are taken
> from the vgabios cvs and update the vgabios.git tree @ qemu.org to
> vgabios release 0.6c. As this update depends on a newer bochs API it
> fully works on qemu 0.13 and master only. When using this vgabios
> version on qemu 0.12 vesa bios support will break.
>
> The last six patches cleanup the build system a bit, add a proper
> PCIROM header so seabios will happily load the roms from the PCI option
> rom bar and add vgabios binaries for all current and the upcoming qxl
> vga device.
Ping?
cheers,
Gerd
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update
2010-11-01 16:02 ` [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update Gerd Hoffmann
@ 2010-11-01 18:00 ` Anthony Liguori
2010-11-02 8:24 ` Gerd Hoffmann
0 siblings, 1 reply; 15+ messages in thread
From: Anthony Liguori @ 2010-11-01 18:00 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
On 11/01/2010 11:02 AM, Gerd Hoffmann wrote:
> On 09/21/10 19:07, Gerd Hoffmann wrote:
>> Hi,
>>
>> This patch series updates the vgabios. The first five patches are taken
>> from the vgabios cvs and update the vgabios.git tree @ qemu.org to
>> vgabios release 0.6c. As this update depends on a newer bochs API it
>> fully works on qemu 0.13 and master only. When using this vgabios
>> version on qemu 0.12 vesa bios support will break.
>>
>> The last six patches cleanup the build system a bit, add a proper
>> PCIROM header so seabios will happily load the roms from the PCI option
>> rom bar and add vgabios binaries for all current and the upcoming qxl
>> vga device.
>
> Ping?
What's the relationship to the other vgabios series, and have you tried
to submit these to the upstream bochs project?
Regards,
Anthony Liguori
>
> cheers,
> Gerd
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Qemu-devel] Re: [VGABIOS PATCH 00/11] vgabios update
2010-11-01 18:00 ` Anthony Liguori
@ 2010-11-02 8:24 ` Gerd Hoffmann
0 siblings, 0 replies; 15+ messages in thread
From: Gerd Hoffmann @ 2010-11-02 8:24 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel
On 11/01/10 19:00, Anthony Liguori wrote:
> On 11/01/2010 11:02 AM, Gerd Hoffmann wrote:
>> On 09/21/10 19:07, Gerd Hoffmann wrote:
>>> Hi,
>>>
>>> This patch series updates the vgabios. The first five patches are taken
>>> from the vgabios cvs and update the vgabios.git tree @ qemu.org to
>>> vgabios release 0.6c. As this update depends on a newer bochs API it
>>> fully works on qemu 0.13 and master only. When using this vgabios
>>> version on qemu 0.12 vesa bios support will break.
>>>
>>> The last six patches cleanup the build system a bit, add a proper
>>> PCIROM header so seabios will happily load the roms from the PCI option
>>> rom bar and add vgabios binaries for all current and the upcoming qxl
>>> vga device.
>>
>> Ping?
>
> What's the relationship to the other vgabios series,
This one is for vgabios, the other one is for qemu. The qemu patch
series depends on new vgabios builds.
> and have you tried
> to submit these to the upstream bochs project?
See other mail, vgabios upstream seems to be dead.
cheers,
Gerd
^ permalink raw reply [flat|nested] 15+ messages in thread