nexoniarz/SchOS
nexoniarz/SchOS
Watch
1
0
Fork
You've already forked SchOS
 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

gfx: the chosen resolution reaches every head, and the greeting stops racing

Browse source 
Two things.

**The F8 resolution now applies to the other displays as well.** It already
reached them once vgpud started -- that was the last commit but one -- but not
before: choosing 1024x768 changed the screen it was chosen on and left the
other at 1280x800, so the menu and then the splash appeared on it as a small
rectangle in the middle of a larger black one. Which is a fair reading of "the
resolution change is not changing resolution".

The resolution offered in that menu is a statement about the machine's display,
not about one adapter of it, so both stages before vgpud now follow it:

  the loader   mirrors_match() puts every mirror GOP into the primary's mode,
               called from mirrors_show() so it cannot be forgotten at a new
               call site. Two integer comparisons in the common case.
  the kernel   setup_scanout() takes gfx's dimensions over GET_DISPLAY_INFO's.
               Same argument as vgpud's bring_up(): the host window's size is
               a fact about QEMU, and the console's mode is the one somebody
               chose.

**And the greeting is no longer a race.** "Welcome to SchOS!" was printed after
every job had been started, including the shell on the console -- so which of
the two reached the screen first was up to the scheduler, and it went both ways
about evenly. A boot that sometimes greets you above the prompt and sometimes
below it does not read as two orderings of one boot; it reads as a line printed
by mistake.

schinitd now holds back the job that owns the console -- `own_tty`, which is
exactly the job whose output lands there -- until after the greeting is
written. That is enough to settle it: this process writes the line, and only
then asks PID 1 to spawn the shell, so the fork has not happened yet. Nothing
waits on it that was not already waiting.

Verified: F8 -> Resolution -> 1024x768 -> boot, with the virtio head
screendumped over QMP at three points during startup and once at the prompt --
1024x768 throughout, and byte-identical to the stdvga head. Three consecutive
boots put the greeting at the same offset, ahead of the prompt every time.
Both supported configurations: one boot each, no traps, no panics, socktest and
memfdtest green.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Nexoniarz 2026-09-22 22:19:00 +02:00
commit 9ab8a7a426
4 changed files with 95 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/drivers/gpu/virtio_gpu/virtio_gpu.c
View file

@ -28,6 +28,7 @@
#include "display.h"
#include "dma.h"
#include "virtio.h"
#include "gfx.h"
// One control queue is enough for 2D: there is also a cursor queue, which is
// only worth having once there is a hardware cursor to move.
@ -280,6 +281,18 @@ setup_scanout(struct vgpu *g)
g->width = (int)info->pmodes[0].r.width;
g->height = (int)info->pmodes[0].r.height;
// But the console's mode wins, when there is a console.
//
// GET_DISPLAY_INFO answers with the size of the *host's window*, which says
// nothing about the machine -- somebody dragged a corner. The resolution
// chosen at the F8 menu is the console's, and a second head that shows the
// console in a different mode shows it letterboxed for no reason. Same
// argument, and the same fix, as in cmd/vgpud/main.c's bring_up().
if (gfx_ready() && gfx_width() && gfx_height()) {
g->width = (int)gfx_width();
g->height = (int)gfx_height();
}
// A host resource to scan out from.
{
struct virtio_gpu_resource_create_2d *c = g->cmd;