mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-08 04:08:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[metal] Fix video mode filtering & frame buffer ref-counting (#889)

Browse source 
Co-authored-by: tkchia <tkchia-cosmo@gmx.com>
This commit is contained in:
tkchia 2023-09-06 18:41:07 +08:00 • committed by GitHub
parent 0d748ad58e
commit b21842ed7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libc/vga/rlinit-vesa.S
View file

@ -46,11 +46,7 @@
.set "mi::sizeof",14
// Routine to activate additional VESA functionality if the user holds
// down a magic key, when booting from bare metal. Currently this just
// dumps a list of all usable VESA VBE video modes on the console.
//
// TODO: allow user to select a video mode and switch to it
// TODO: implement character drawing in graphics modes
// down a magic key, when booting from bare metal.
//
// @return CF = 0 if we decided to set a new video mode, CF = 1 otherwise
@ -372,7 +368,7 @@ _rlinit_vesa:
jz .fail3
call .video_type # check if we know about the video
jc .fail3 # buffer type, & what exact type it is
mov (%bp),%bx # if we are already tracking too
mov (%bp),%bx # if we are already tracking too many
cmp $MAX_VESA_MODES_TO_TRACK,%bx # VESA modes, also skip
jnb .fail3
inc %bx # otherwise start noting down mode
@ -435,7 +431,7 @@ _rlinit_vesa:
mov $PC_VIDEO_TEXT,%al # if text mode, simply say so
test $0b00010000,%cl
jz .ok4
cmpl $6,%es:0x1b(%di) # if graphics mode, check if direct
cmpb $6,%es:0x1b(%di) # if graphics mode, check if direct
jnz .fail4 # color; bail out if not
mov %es:0x19(%di),%cl # check actual color fields & bits
mov %es:0x1f(%di),%ax # per pixel, against a list

5
libc/vga/vga-init.greg.c
View file

@ -53,9 +53,8 @@ void _vga_reinit(struct Tty *tty, unsigned short starty, unsigned short startx,
chr_ht = VGA_ASSUME_CHAR_HEIGHT_PX;
chr_wid = VGA_ASSUME_CHAR_WIDTH_PX;
/* Make sure the video buffer is mapped into virtual memory. */
__invert_memory_area(mm, __get_pml4t(), vid_buf_phy, vid_buf_sz,
PAGE_RW | PAGE_XD);
__ref_pages(mm, __get_pml4t(), vid_buf_phy, vid_buf_sz);
__invert_and_perm_ref_memory_area(mm, __get_pml4t(), vid_buf_phy, vid_buf_sz,
PAGE_RW | PAGE_XD);
/*
* Initialize our tty structure from the current screen geometry, screen
* contents, cursor position, & character dimensions.