dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-02 22:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

console: when switching console modes and one doesn't work, always go for the next

Browse Source 
So far we already had a logic in place to go for the next mode if some
mode doesn't work – but it was only applied if we'd actively cycle
through resolutions.

Let's extend the logic and always apply it: whenever we try to switch to
a mode, and it doesn't work, go to the next one until we find one that
works.

Fixes: #37324
This commit is contained in:
Lennart Poettering
2025-06-20 11:05:00 +02:00
committed by Yu Watanabe
parent 0dc39dffbd
commit b53c3af3fe
1 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/boot/console.c
View File

@@ -250,38 +250,72 @@ static int64_t get_auto_mode(void) {
return CONSOLE_MODE_80_25;
}
static int next_mode(int64_t mode, int64_t direction) {
assert(IN_SET(direction, 1, -1));
assert(ST->ConOut->Mode->MaxMode > 0);
/* Always start at the beginning if we are out of range or reached the last mode already */
if (direction > 0) {
if (mode < CONSOLE_MODE_RANGE_MIN || mode >= ST->ConOut->Mode->MaxMode-1)
return CONSOLE_MODE_RANGE_MIN;
} else if (direction < 0) {
if (mode <= CONSOLE_MODE_RANGE_MIN || mode > ST->ConOut->Mode->MaxMode-1)
return ST->ConOut->Mode->MaxMode-1;
} else
assert_not_reached();
return mode + direction;
}
EFI_STATUS console_set_mode(int64_t mode) {
EFI_STATUS r;
/* If there are no modes defined, fail immediately */
if (ST->ConOut->Mode->MaxMode <= 0)
return mode == CONSOLE_MODE_KEEP ? EFI_SUCCESS : EFI_UNSUPPORTED;
int64_t target, direction = 1;
switch (mode) {
case CONSOLE_MODE_KEEP:
/* If the firmware indicates the current mode is invalid, change it anyway. */
if (ST->ConOut->Mode->Mode < CONSOLE_MODE_RANGE_MIN)
return change_mode(CONSOLE_MODE_RANGE_MIN);
return EFI_SUCCESS;
if (ST->ConOut->Mode->Mode >= CONSOLE_MODE_RANGE_MIN &&
ST->ConOut->Mode->Mode < ST->ConOut->Mode->MaxMode)
return EFI_SUCCESS;
target = CONSOLE_MODE_RANGE_MIN;
break;
case CONSOLE_MODE_NEXT:
if (ST->ConOut->Mode->MaxMode <= CONSOLE_MODE_RANGE_MIN)
return EFI_UNSUPPORTED;
mode = MAX(CONSOLE_MODE_RANGE_MIN, ST->ConOut->Mode->Mode);
do {
mode = (mode + 1) % ST->ConOut->Mode->MaxMode;
if (change_mode(mode) == EFI_SUCCESS)
break;
/* If this mode is broken/unsupported, try the next.
* If mode is 0, we wrapped around and should stop. */
} while (mode > CONSOLE_MODE_RANGE_MIN);
return EFI_SUCCESS;
target = next_mode(ST->ConOut->Mode->Mode, direction);
break;
case CONSOLE_MODE_AUTO:
return change_mode(get_auto_mode());
target = get_auto_mode();
break;
case CONSOLE_MODE_FIRMWARE_MAX:
/* Note: MaxMode is the number of modes, not the last mode. */
return change_mode(ST->ConOut->Mode->MaxMode - 1LL);
target = ST->ConOut->Mode->MaxMode - 1;
direction = -1; /* search backwards for a working mode */
break;
case CONSOLE_MODE_RANGE_MIN...CONSOLE_MODE_RANGE_MAX:
target = mode;
break;
default:
return change_mode(mode);
assert_not_reached();
}
for (int64_t attempt = 0;; attempt++) {
r = change_mode(target);
if (r == EFI_SUCCESS)
return EFI_SUCCESS;
if (attempt >= ST->ConOut->Mode->MaxMode-1) /* give up, once we tried them all */
return r;
/* If this mode is broken/unsupported, try the next. */
target = next_mode(target, direction);
}
}