[PATCH 0/2] cbvga text emulation and software cursor
by Kevin O'Connor
This is a resend of two previous patches that improve the text
emulation of the "coreboot native vga" SeaVGABIOS support. The main
difference in this version is that the support requires both a compile
time define (CONFIG_VGA_EMULATE_TEXT) as well as runtime enablement.
The net effect of this is that the code wont try to blink the cursor
if a bootloader explicitly switches into graphics mode.
This is also available at:
https://github.com/KevinOConnor/seabios/tree/testing
-Kevin
Kevin O'Connor (2):
vgabios: Support emulating text mode attributes while in graphics mode
vgabios: Add software cursor capability
vgasrc/Kconfig | 6 ++++
vgasrc/cbvga.c | 10 +++++--
vgasrc/vbe.c | 5 ++--
vgasrc/vgabios.c | 13 ++++++--
vgasrc/vgabios.h | 14 ++++++++-
vgasrc/vgaentry.S | 30 +++++++++++++++++++
vgasrc/vgafb.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
vgasrc/vgainit.c | 34 +++++++++++++++++++++
8 files changed, 188 insertions(+), 13 deletions(-)
--
1.9.3
4 years, 6 months
Re: [SeaBIOS] [PATCH 1/4] xhci: Update the times for usb command timeouts.
by Kevin O'Connor
On Sun, Jun 22, 2014 at 05:54:17PM +0200, Idwer Vollering wrote:
> > So, this looks different from Matt's report. What appears to be
> > happening in the above is that the device shows up originally as a
> > high speed device (see "[High]" above). However, when the set_address
> > command is sent to it, it appears that the device effectively
> > disconnects and then reconnects as a super speed device (see "change
> > port #2" and "change port #4" above - port 2==port 4 - see ("offset 1"
> > / "offset 3" above)).
> >
> > You can try increasing the xchi_event_wait timeout which fixes Matt's
> > issue, but I think we tried this on your hardware before with no luck.
>
> Indeed, changing 1000 to 5000 or USB_TIME_COMMAND in
> src/hw/usb-xhci.c:501 didn't matter.
Can you retry with the patch series I just posted? It's also at:
https://github.com/KevinOConnor/seabios/tree/testing
It may help with this device.
-Kevin
4 years, 6 months
[PATCH 1/4] vgabios: Only init BDA device details in init_bios_area()
by Kevin O'Connor
Don't set the device details when changing modes, and don't set mode
details outside of mode setting.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/vgabios.c | 9 ---------
vgasrc/vgainit.c | 19 ++++++++-----------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 5fdb549..e2a4efc 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -326,15 +326,6 @@ vga_set_mode(int mode, int flags)
SET_BDA(video_pagestart, 0x0000);
SET_BDA(video_page, 0x00);
- // FIXME We nearly have the good tables. to be reworked
- SET_BDA(dcc_index, 0x08); // 8 is VGA should be ok for now
- SET_BDA(video_savetable
- , SEGOFF(get_global_seg(), (u32)&video_save_pointer_table));
-
- // FIXME
- SET_BDA(video_msr, 0x00); // Unavailable on vanilla vga, but...
- SET_BDA(video_pal, 0x00); // Unavailable on vanilla vga, but...
-
// Set the ints 0x1F and 0x43
SET_IVT(0x1f, SEGOFF(get_global_seg(), (u32)&vgafont8[128 * 8]));
diff --git a/vgasrc/vgainit.c b/vgasrc/vgainit.c
index 5c76c5b..c323cf8 100644
--- a/vgasrc/vgainit.c
+++ b/vgasrc/vgainit.c
@@ -140,20 +140,17 @@ init_bios_area(void)
// set 80x25 color (not clear from RBIL but usual)
set_equipment_flags(0x30, 0x20);
- // the default char height
- SET_BDA(char_height, 0x10);
-
- // Clear the screen
- SET_BDA(video_ctl, 0x60);
-
- // Set the basic screen we have
- SET_BDA(video_switches, 0xf9);
-
// Set the basic modeset options
SET_BDA(modeset_ctl, 0x51);
- // Set the default MSR
- SET_BDA(video_msr, 0x09);
+ // FIXME We nearly have the good tables. to be reworked
+ SET_BDA(dcc_index, 0x08); // 8 is VGA should be ok for now
+ SET_BDA(video_savetable
+ , SEGOFF(get_global_seg(), (u32)&video_save_pointer_table));
+
+ // FIXME
+ SET_BDA(video_msr, 0x00); // Unavailable on vanilla vga, but...
+ SET_BDA(video_pal, 0x00); // Unavailable on vanilla vga, but...
}
int VgaBDF VAR16 = -1;
--
1.9.3
4 years, 6 months
[PATCH 1/4] Don't clobber %ax on ENTRY_INTO32 macro
by Kevin O'Connor
There's no need to clobber %ax in ENTRY_INTO32. Now that %eax isn't
clobbered, use ENTRY_INTO32 in entry_csm.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/entryfuncs.S | 5 ++---
src/romlayout.S | 10 ++--------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/entryfuncs.S b/src/entryfuncs.S
index 679b1fc..8438604 100644
--- a/src/entryfuncs.S
+++ b/src/entryfuncs.S
@@ -135,10 +135,9 @@
.endm
// Reset stack, transition to 32bit mode, and call a C function.
- // Clobbers %ax
.macro ENTRY_INTO32 cfunc
- xorw %ax, %ax
- movw %ax, %ss
+ xorw %dx, %dx
+ movw %dx, %ss
movl $ BUILD_STACK_ADDR , %esp
movl $ \cfunc , %edx
jmp transition32
diff --git a/src/romlayout.S b/src/romlayout.S
index cca4e43..4ebbdee 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -431,14 +431,8 @@ entry_csm:
shll $4, %eax
addl %esp, %eax
- // Change to BUILD_STACK_ADDR stack
- xorl %ebx, %ebx
- movw %bx, %ss
- movl $BUILD_STACK_ADDR, %esp
-
- // Jump to 32bit mode and call handle_csm(bregs)
- movl $_cfunc32flat_handle_csm, %edx
- jmp transition32
+ // Change to BUILD_STACK_ADDR stack and call handle_csm(bregs)
+ ENTRY_INTO32 _cfunc32flat_handle_csm
DECLFUNC __csm_return
.code32
--
1.9.3
4 years, 6 months
[PATCH 00/11] USB interface cleanup and simplification
by Kevin O'Connor
The first six patches in this series make the internal usb naming
convention a little more standard. (Use a "usb_" prefix on all
exported functions and don't use camel case on exported functions.)
The remaining five patches convert the USB controller drivers to a
single pipe "realloc" function for managing pipe allocations and
freeing. This should make it easier for xhci to implement pipe
freeing (not implemented in this series).
-Kevin
Kevin O'Connor (11):
usb: Rename ?hci_control() to ?hci_send_control()
usb: Rename usb_getFrameExp() to usb_get_period()
usb: Rename findEndPointDesc() to usb_find_desc()
usb: Rename send_default_control() to usb_send_default_control()
usb: Rename free_pipe() to usb_free_pipe()
usb: Clarify usb freelist manipulations
xhci: Change xhci_update_pipe() to xhci_realloc_pipe() and use for
alloc too
uhci: Export uhci_realloc_pipe() instead of uhci_alloc_pipe()
ohci: Export ohci_realloc_pipe() instead of ohci_alloc_pipe()
ehci: Export ehci_realloc_pipe() instead of ehci_alloc_pipe()
usb: Use usb_realloc_pipe for pipe alloc, update, and free.
src/hw/usb-ehci.c | 17 +++++----
src/hw/usb-ehci.h | 9 +++--
src/hw/usb-hid.c | 6 +--
src/hw/usb-hub.c | 8 ++--
src/hw/usb-msc.c | 10 ++---
src/hw/usb-ohci.c | 17 +++++----
src/hw/usb-ohci.h | 9 +++--
src/hw/usb-uas.c | 8 ++--
src/hw/usb-uhci.c | 17 +++++----
src/hw/usb-uhci.h | 9 +++--
src/hw/usb-xhci.c | 18 ++++++---
src/hw/usb-xhci.h | 12 +++---
src/hw/usb.c | 109 +++++++++++++++++++++++++++++-------------------------
src/hw/usb.h | 22 ++++++-----
14 files changed, 149 insertions(+), 122 deletions(-)
--
1.9.3
4 years, 6 months
[PATCH] vgabios: Add software cursor capability
by Kevin O'Connor
Add mechanism for drawing a cursor to the framebuffer to implement a
cursor in software. The timer interrupt is "hooked" so that the
cursor can blink. This can be useful for "coreboot native vga".
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
This is similar to the software cursor patches I sent earlier in the
week. This time I've used the timer interrupt to both improve the
drawing speed and to enable cursor blinking. This version of the
patch also creates a small underline cursor instead of inverting the
entire character cell.
The series is also available at:
https://github.com/KevinOConnor/seabios/tree/testing
---
vgasrc/Kconfig | 5 +++++
vgasrc/vgabios.c | 13 ++++++++---
vgasrc/vgabios.h | 6 +++++-
vgasrc/vgaentry.S | 30 ++++++++++++++++++++++++++
vgasrc/vgafb.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
vgasrc/vgainit.c | 34 +++++++++++++++++++++++++++++
6 files changed, 148 insertions(+), 4 deletions(-)
diff --git a/vgasrc/Kconfig b/vgasrc/Kconfig
index 6474c22..5f3cc9d 100644
--- a/vgasrc/Kconfig
+++ b/vgasrc/Kconfig
@@ -51,6 +51,7 @@ menu "VGA ROM"
depends on COREBOOT
bool "coreboot linear framebuffer"
select VGA_EMULATE_TEXTATTR
+ select VGA_SOFTWARE_CURSOR
help
Build support for a vgabios wrapper around video
devices initialized using coreboot native vga init.
@@ -89,6 +90,10 @@ menu "VGA ROM"
help
Try to emulate text mode attributes when writing text in
graphics mode.
+ config VGA_SOFTWARE_CURSOR
+ bool
+ help
+ Emulate a cursor by modifying the framebuffer.
config VGA_ALLOCATE_EXTRA_STACK
depends on BUILD_VGABIOS
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 786c009..5fdb549 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -51,7 +51,7 @@ calc_page_size(u8 memmodel, u16 width, u16 height)
}
// Determine cursor shape (taking into account possible cursor scaling)
-static u16
+u16
get_cursor_shape(void)
{
u16 cursor_type = GET_BDA(cursor_type);
@@ -74,6 +74,7 @@ get_cursor_shape(void)
static void
set_cursor_shape(u16 cursor_type)
{
+ vgafb_set_swcursor(0);
SET_BDA(cursor_type, cursor_type);
if (CONFIG_VGA_STDVGA_PORTS)
stdvga_set_cursor_shape(get_cursor_shape());
@@ -88,6 +89,8 @@ set_cursor_pos(struct cursorpos cp)
if (page > 7)
return;
+ vgafb_set_swcursor(0);
+
// Bios cursor pos
SET_BDA(cursor_pos[page], (y << 8) | x);
@@ -103,7 +106,7 @@ set_cursor_pos(struct cursorpos cp)
stdvga_set_cursor_pos((int)text_address(cp));
}
-static struct cursorpos
+struct cursorpos
get_cursor_pos(u8 page)
{
if (page == 0xff)
@@ -129,6 +132,8 @@ set_active_page(u8 page)
if (!vmode_g)
return;
+ vgafb_set_swcursor(0);
+
// Calculate memory address of start of page
struct cursorpos cp = {0, 0, page};
int address = (int)text_address(cp);
@@ -282,6 +287,8 @@ vga_set_mode(int mode, int flags)
if (!vmode_g)
return VBE_RETURN_STATUS_FAILED;
+ vgafb_set_swcursor(0);
+
int ret = vgahw_set_mode(vmode_g, flags);
if (ret)
return ret;
@@ -305,7 +312,7 @@ vga_set_mode(int mode, int flags)
int cwidth = GET_GLOBAL(vmode_g->cwidth);
SET_BDA(video_cols, width / cwidth);
SET_BDA(video_rows, (height / cheight) - 1);
- SET_BDA(cursor_type, 0x0000);
+ SET_BDA(cursor_type, CONFIG_VGA_SOFTWARE_CURSOR ? 0x0607 : 0x0000);
}
SET_BDA(video_pagesize, calc_page_size(memmodel, width, height));
SET_BDA(crtc_address, CONFIG_VGA_STDVGA_PORTS ? stdvga_get_crtc() : 0);
diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index 0ec4a8e..98dc3cd 100644
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -84,7 +84,8 @@ struct vga_bda_s {
u16 vgamode_offset;
} PACKED;
-#define BF_PM_MASK 0x0f
+#define BF_PM_MASK 0x0f
+#define BF_SWCURSOR 0x10
#define GET_BDA_EXT(var) \
GET_FARVAR(SEG_BDA, ((struct vga_bda_s *)VGA_CUSTOM_BDA)->var)
@@ -117,6 +118,8 @@ struct cursorpos {
};
int vga_bpp(struct vgamode_s *vmode_g);
u16 calc_page_size(u8 memmodel, u16 width, u16 height);
+u16 get_cursor_shape(void);
+struct cursorpos get_cursor_pos(u8 page);
int bda_save_restore(int cmd, u16 seg, void *data);
struct vgamode_s *get_current_mode(void);
int vga_set_mode(int mode, int flags);
@@ -133,6 +136,7 @@ void vgafb_write_char(struct cursorpos cp, struct carattr ca);
struct carattr vgafb_read_char(struct cursorpos cp);
void vgafb_write_pixel(u8 color, u16 x, u16 y);
u8 vgafb_read_pixel(u16 x, u16 y);
+void vgafb_set_swcursor(int enable);
// vbe.c
extern u32 VBE_total_memory;
diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index 5d45380..c05502d 100644
--- a/vgasrc/vgaentry.S
+++ b/vgasrc/vgaentry.S
@@ -133,3 +133,33 @@ entry_10_extrastack:
pushl BREGS_code(%eax)
RESTOREBREGS_DSEAX
iretw
+
+ // Timer irq handling
+ DECLFUNC entry_timer_hook
+entry_timer_hook:
+ ENTRY handle_timer_hook
+ ljmpw *%cs:Timer_Hook_Resume
+
+ // Timer irq handling on extra stack
+ DECLFUNC entry_timer_hook_extrastack
+entry_timer_hook_extrastack:
+ cli
+ cld
+ pushw %ds // Set %ds:%eax to space on ExtraStack
+ pushl %eax
+ movw %cs:ExtraStackSeg, %ds
+ movl $(CONFIG_VGA_EXTRA_STACK_SIZE-BREGS_size-8), %eax
+ SAVEBREGS_POP_DSEAX
+ movl %esp, BREGS_size(%eax)
+ movw %ss, BREGS_size+4(%eax)
+
+ movw %ds, %dx // Setup %ss/%esp and call function
+ movw %dx, %ss
+ movl %eax, %esp
+ calll handle_timer_hook
+
+ movl %esp, %eax // Restore registers and return
+ movw BREGS_size+4(%eax), %ss
+ movl BREGS_size(%eax), %esp
+ RESTOREBREGS_DSEAX
+ ljmpw *%cs:Timer_Hook_Resume
diff --git a/vgasrc/vgafb.c b/vgasrc/vgafb.c
index 9652683..2260253 100644
--- a/vgasrc/vgafb.c
+++ b/vgasrc/vgafb.c
@@ -454,6 +454,30 @@ gfx_write_char(struct vgamode_s *vmode_g
}
}
+// Draw/undraw a cursor on the framebuffer by xor'ing the cursor cell
+void
+gfx_set_swcursor(struct vgamode_s *vmode_g, int enable
+ , struct cursorpos cp, u16 cursor_type)
+{
+ u8 start = cursor_type >> 8, end = (cursor_type & 0xff) + 1;
+ struct gfx_op op;
+ init_gfx_op(&op, vmode_g);
+ op.x = cp.x * 8;
+ int cheight = GET_BDA(char_height);
+ op.y = cp.y * cheight + start;
+
+ int i;
+ for (i = start; i < cheight && i < end; i++, op.y++) {
+ op.op = GO_READ8;
+ handle_gfx_op(&op);
+ int j;
+ for (j = 0; j < 8; j++)
+ op.pixels[j] ^= 0x07;
+ op.op = GO_WRITE8;
+ handle_gfx_op(&op);
+ }
+}
+
// Set the pixel at the given position.
void
vgafb_write_pixel(u8 color, u16 x, u16 y)
@@ -461,6 +485,7 @@ vgafb_write_pixel(u8 color, u16 x, u16 y)
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
return;
+ vgafb_set_swcursor(0);
struct gfx_op op;
init_gfx_op(&op, vmode_g);
@@ -485,6 +510,7 @@ vgafb_read_pixel(u16 x, u16 y)
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
return 0;
+ vgafb_set_swcursor(0);
struct gfx_op op;
init_gfx_op(&op, vmode_g);
@@ -518,6 +544,7 @@ vgafb_move_chars(struct cursorpos dest
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
return;
+ vgafb_set_swcursor(0);
if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
gfx_move_chars(vmode_g, dest, src, movesize);
@@ -538,6 +565,7 @@ vgafb_clear_chars(struct cursorpos dest
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
return;
+ vgafb_set_swcursor(0);
if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
gfx_clear_chars(vmode_g, dest, ca, clearsize);
@@ -557,6 +585,7 @@ vgafb_write_char(struct cursorpos cp, struct carattr ca)
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
return;
+ vgafb_set_swcursor(0);
if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
gfx_write_char(vmode_g, cp, ca);
@@ -579,6 +608,7 @@ vgafb_read_char(struct cursorpos cp)
struct vgamode_s *vmode_g = get_current_mode();
if (!vmode_g)
goto fail;
+ vgafb_set_swcursor(0);
if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
// FIXME gfx mode
@@ -595,3 +625,37 @@ fail: ;
struct carattr ca2 = {0, 0, 0};
return ca2;
}
+
+// Draw/undraw a cursor on the screen
+void
+vgafb_set_swcursor(int enable)
+{
+ if (!CONFIG_VGA_SOFTWARE_CURSOR)
+ return;
+ u8 flags = GET_BDA_EXT(flags);
+ if (!!(flags & BF_SWCURSOR) == enable)
+ // Already in requested mode.
+ return;
+ struct vgamode_s *vmode_g = get_current_mode();
+ if (!vmode_g)
+ return;
+ struct cursorpos cp = get_cursor_pos(0xff);
+ u16 cursor_type = get_cursor_shape();
+ if (cp.x >= GET_BDA(video_cols) || cp.y > GET_BDA(video_rows)
+ || cursor_type >= 0x2000)
+ // Cursor not visible
+ return;
+
+ SET_BDA_EXT(flags, (flags & ~BF_SWCURSOR) | (enable ? BF_SWCURSOR : 0));
+
+ if (GET_GLOBAL(vmode_g->memmodel) != MM_TEXT) {
+ gfx_set_swcursor(vmode_g, enable, cp, cursor_type);
+ return;
+ }
+
+ // In text mode, swap foreground and background attributes for cursor
+ void *dest_far = text_address(cp) + 1;
+ u8 attr = GET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)dest_far);
+ attr = (attr >> 4) | (attr << 4);
+ SET_FARVAR(GET_GLOBAL(vmode_g->sstart), *(u8*)dest_far, attr);
+}
diff --git a/vgasrc/vgainit.c b/vgasrc/vgainit.c
index 9d6dd1e..5c76c5b 100644
--- a/vgasrc/vgainit.c
+++ b/vgasrc/vgainit.c
@@ -98,6 +98,38 @@ allocate_extra_stack(void)
/****************************************************************
+ * Timer hook
+ ****************************************************************/
+
+struct segoff_s Timer_Hook_Resume VAR16 VISIBLE16;
+
+void VISIBLE16
+handle_timer_hook(void)
+{
+ if (!CONFIG_VGA_SOFTWARE_CURSOR)
+ return;
+ vgafb_set_swcursor(GET_BDA(timer_counter) % 18 < 9);
+}
+
+static void
+hook_timer_irq(void)
+{
+ if (!CONFIG_VGA_SOFTWARE_CURSOR)
+ return;
+ extern void entry_timer_hook(void);
+ extern void entry_timer_hook_extrastack(void);
+ struct segoff_s oldirq = GET_IVT(0x08);
+ struct segoff_s newirq = SEGOFF(get_global_seg(), (u32)entry_timer_hook);
+ if (GET_GLOBAL(ExtraStackSeg))
+ newirq = SEGOFF(get_global_seg(), (u32)entry_timer_hook_extrastack);
+ dprintf(1, "Hooking hardware timer irq (old=%x new=%x)\n"
+ , oldirq.segoff, newirq.segoff);
+ SET_VGA(Timer_Hook_Resume, oldirq);
+ SET_IVT(0x08, newirq);
+}
+
+
+/****************************************************************
* VGA post
****************************************************************/
@@ -164,6 +196,8 @@ vga_post(struct bregs *regs)
allocate_extra_stack();
+ hook_timer_irq();
+
SET_VGA(HaveRunInit, 1);
// Fixup checksum
--
1.9.3
4 years, 7 months
[PATCH] vgabios: Rename vbe_flags to flags
by Kevin O'Connor
Allow the custom bda field vbe_flags to be used for flags outside of
vbe.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/vbe.c | 7 ++++---
vgasrc/vgabios.h | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/vgasrc/vbe.c b/vgasrc/vbe.c
index 06ec22e..e2aeced 100644
--- a/vgasrc/vbe.c
+++ b/vgasrc/vbe.c
@@ -381,11 +381,12 @@ vbe_104f10(struct bregs *regs)
case 0x00:
regs->bx = 0x0f30;
break;
- case 0x01:
- SET_BDA_EXT(vbe_flag, regs->bh);
+ case 0x01: ;
+ u8 flags = GET_BDA_EXT(flags);
+ SET_BDA_EXT(flags, (flags & ~BF_PM_MASK) | (regs->bh & BF_PM_MASK));
break;
case 0x02:
- regs->bh = GET_BDA_EXT(vbe_flag);
+ regs->bh = GET_BDA_EXT(flags) & BF_PM_MASK;
break;
default:
regs->ax = 0x014f;
diff --git a/vgasrc/vgabios.h b/vgasrc/vgabios.h
index fc8d45a..0ec4a8e 100644
--- a/vgasrc/vgabios.h
+++ b/vgasrc/vgabios.h
@@ -79,11 +79,13 @@ struct gfx_op {
#define VGA_CUSTOM_BDA 0xb9
struct vga_bda_s {
- u8 vbe_flag;
+ u8 flags;
u16 vbe_mode;
u16 vgamode_offset;
} PACKED;
+#define BF_PM_MASK 0x0f
+
#define GET_BDA_EXT(var) \
GET_FARVAR(SEG_BDA, ((struct vga_bda_s *)VGA_CUSTOM_BDA)->var)
#define SET_BDA_EXT(var, val) \
--
1.9.3
4 years, 7 months
[PATCH 1/2] vgabios: Set cursor shape fixes
by Kevin O'Connor
The "cursor scaling" mode is determined by the first bit of the
video_ctl bda value, not the modeset_ctl value. Also, on a
set_scan_lines() call, the shape should be set to lines-3/lines-2 and
the shape must be set after char_height has been updated.
The existing cursor shape code matches the legacy "lgpl vgabios", but
the behavior doesn't match bios documentation nor observations with an
ati vga bios.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
vgasrc/vgabios.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 8ec6aa6..47bf581 100644
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -62,9 +62,9 @@ set_cursor_shape(u8 start, u8 end)
if (!CONFIG_VGA_STDVGA_PORTS)
return;
- u8 modeset_ctl = GET_BDA(modeset_ctl);
+ u8 emulate_cursor = (GET_BDA(video_ctl) & 1) == 0;
u16 cheight = GET_BDA(char_height);
- if ((modeset_ctl & 0x01) && (cheight > 8) && (end < 8) && (start < 0x20)) {
+ if (emulate_cursor && (cheight > 8) && (end < 8) && (start < 0x20)) {
if (end != (start + 1))
start = ((start + 1) * cheight / 8) - 1;
else
@@ -79,7 +79,6 @@ get_cursor_shape(u8 page)
{
if (page > 7)
return 0;
- // FIXME should handle VGA 14/16 lines
return GET_BDA(cursor_type);
}
@@ -117,7 +116,6 @@ get_cursor_pos(u8 page)
struct cursorpos cp = { 0, 0, 0xfe };
return cp;
}
- // FIXME should handle VGA 14/16 lines
u16 xy = GET_BDA(cursor_pos[page]);
struct cursorpos cp = {xy, xy>>8, page};
return cp;
@@ -153,16 +151,16 @@ static void
set_scan_lines(u8 lines)
{
stdvga_set_scan_lines(lines);
- if (lines == 8)
- set_cursor_shape(0x06, 0x07);
- else
- set_cursor_shape(lines - 4, lines - 3);
SET_BDA(char_height, lines);
u16 vde = stdvga_get_vde();
u8 rows = vde / lines;
SET_BDA(video_rows, rows - 1);
u16 cols = GET_BDA(video_cols);
SET_BDA(video_pagesize, calc_page_size(MM_TEXT, cols, rows));
+ if (lines == 8)
+ set_cursor_shape(0x06, 0x07);
+ else
+ set_cursor_shape(lines - 3, lines - 2);
}
@@ -981,9 +979,7 @@ handle_101233(struct bregs *regs)
static void
handle_101234(struct bregs *regs)
{
- u8 v = (regs->al & 0x01) ^ 0x01;
- u8 v2 = GET_BDA(modeset_ctl) & ~0x01;
- SET_BDA(modeset_ctl, v | v2);
+ SET_BDA(video_ctl, (GET_BDA(video_ctl) & ~0x01) | (regs->al & 0x01));
regs->al = 0x12;
}
--
1.9.3
4 years, 7 months
[PATCH] Use 32bit memcpy in int1587 when applicable
by Kevin O'Connor
If the amount of data to be copied is an even number of four, then
copy the data in four byte chunks. This 32bit copy is more efficient,
in particular when copying to/from memory mapped io. This should
improve the performance of framebuffer draws in cbvga SeaVGABIOS.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/system.c | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/system.c b/src/system.c
index bcf7e90..60a6fce 100644
--- a/src/system.c
+++ b/src/system.c
@@ -92,8 +92,7 @@ handle_1587(struct bregs *regs)
// check for access rights of source & dest here
// Initialize GDT descriptor
- u32 si = regs->si;
- u64 *gdt_far = (void*)si;
+ u64 *gdt_far = (void*)(regs->si + 0);
u16 gdt_seg = regs->es;
u32 loc = (u32)MAKE_FLATPTR(gdt_seg, gdt_far);
SET_FARVAR(gdt_seg, gdt_far[1], GDT_DATA | GDT_LIMIT((6*sizeof(u64))-1)
@@ -107,10 +106,11 @@ handle_1587(struct bregs *regs)
loc = (u32)MAKE_FLATPTR(GET_SEG(SS), 0);
SET_FARVAR(gdt_seg, gdt_far[5], GDT_DATA | lim | GDT_BASE(loc));
- u16 count = regs->cx;
+ SET_SEG(ES, gdt_seg);
+ u16 count = regs->cx, si = 0, di = 0;
asm volatile(
// Load new descriptor tables
- " lgdtw %%es:(1<<3)(%%si)\n"
+ " lgdtw %%es:(1<<3)(%%eax)\n"
" lidtw %%cs:pmode_IDT_info\n"
// Enable protected mode
@@ -127,13 +127,14 @@ handle_1587(struct bregs *regs)
" movw $(3<<3), %%ax\n" // 3rd descriptor in table, TI=GDT, RPL=00
" movw %%ax, %%es\n"
- // move CX words from DS:SI to ES:DI
- " xorw %%si, %%si\n"
- " xorw %%di, %%di\n"
- " rep movsw\n"
+ // memcpy CX words using 32bit memcpy if applicable
+ " testw $1, %%cx\n"
+ " jnz 3f\n"
+ " shrw $1, %%cx\n"
+ " rep movsl %%ds:(%%si), %%es:(%%di)\n"
// Restore DS and ES segment limits to 0xffff
- " movw $(5<<3), %%ax\n" // 5th descriptor in table (SS)
+ "2:movw $(5<<3), %%ax\n" // 5th descriptor in table (SS)
" movw %%ax, %%ds\n"
" movw %%ax, %%es\n"
@@ -143,16 +144,21 @@ handle_1587(struct bregs *regs)
" movl %%eax, %%cr0\n"
// far jump to flush CPU queue after transition to real mode
- " ljmpw $" __stringify(SEG_BIOS) ", $2f\n"
+ " ljmpw $" __stringify(SEG_BIOS) ", $4f\n"
+
+ // Slower 16bit copy method
+ "3:rep movsw %%ds:(%%si), %%es:(%%di)\n"
+ " jmp 2b\n"
// restore IDT to normal real-mode defaults
- "2:lidtw %%cs:rmode_IDT_info\n"
+ "4:lidtw %%cs:rmode_IDT_info\n"
// Restore %ds (from %ss)
" movw %%ss, %%ax\n"
" movw %%ax, %%ds\n"
- : "+c"(count), "+S"(si), "+m" (__segment_ES)
- : : "eax", "di", "cc");
+ : "+a" (gdt_far), "+c"(count), "+m" (__segment_ES)
+ : "S" (si), "D" (di)
+ : "cc");
set_a20(prev_a20_enable);
--
1.9.3
4 years, 7 months
[PATCH 0/2] Software cursor for cbvga
by Kevin O'Connor
These two patches implement a software based cursor for the "coreboot
native vga" seavgabios implementation. It implements the cursor by
inverting the pixels in the framebuffer at the character cell that
contains the cursor.
This is a bit of a failed experiment - I do not intend to commit it to
the main git repo as is. The feature works, but it seems to slow down
screen writing significantly. I'm posting this here in case anyone is
interested in playing with it.
I've also put this up at:
https://github.com/KevinOConnor/seabios/tree/testing-cbvga
I suspect the reason for the slow down is that the majority of
character writes to the screen end up moving the cursor, and on each
cursor move it's required to remove the inverse in the old position
and then add the inverse in the new position. The inverse is
implemented as an xor which requires a cell read followed by a cell
write. Thus, a typical character write used to require writing one
cell's worth of data to the framebuffer, but with this patch takes 5
times more IO (a read/write, a write, a read/write).
If I get time I may play with other approaches. (One I was thinking
of is hooking the BIOS timer irq and only enabling the cursor from
that irq - which should dramatically reduce the amount of cursor
updates when lots of characters are being rendered in bulk.)
-Kevin
Kevin O'Connor (2):
vgabios: Add stubs for software cursor enable/disable
vgabios: Add software cursor capability
vgasrc/Kconfig | 5 +++++
vgasrc/vgabios.c | 40 ++++++++++++++++++++++++++++++++++------
vgasrc/vgabios.h | 2 ++
vgasrc/vgafb.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 90 insertions(+), 6 deletions(-)
--
1.9.3
4 years, 7 months