Commit 7f7e55b8 authored by Jan Beulich's avatar Jan Beulich

video/vesa: drop "vesa-remap" command line option

If we get mode dimensions wrong, having the remapping size controllable
via command line option isn't going to help much. Drop the option.

While adjusting this also
- add __initdata to the variable,
- use ROUNDUP() instead of open-coding it.
Requested-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
parent 6ba70106
......@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
### Removed / support downgraded
- dropped support for the (x86-only) "vesa-mtrr" command line option
- dropped support for the (x86-only) "vesa-mtrr" and "vesa-remap" command line options
## [4.16.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - 2021-12-02
......
......@@ -2489,9 +2489,6 @@ PCPUs when using the credit1 scheduler. This prevents rapid fluttering
of a VCPU between CPUs, and reduces the implicit overheads such as
cache-warming. 1ms (1000) has been measured as a good value.
### vesa-map
> `= <integer>`
### vesa-ram
> `= <integer>`
......
......@@ -26,8 +26,7 @@ static bool_t vga_compat;
static unsigned int vram_total;
integer_param("vesa-ram", vram_total);
static unsigned int vram_remap;
integer_param("vesa-map", vram_remap);
static unsigned int __initdata vram_remap;
static int font_height;
static int __init parse_font_height(const char *s)
......@@ -79,12 +78,8 @@ void __init vesa_early_init(void)
* use for vesafb. With modern cards it is no
* option to simply use vram_total as that
* wastes plenty of kernel address space. */
vram_remap = (vram_remap ?
(vram_remap << 20) :
((vram_vmode + (1 << L2_PAGETABLE_SHIFT) - 1) &
~((1 << L2_PAGETABLE_SHIFT) - 1)));
vram_remap = max_t(unsigned int, vram_remap, vram_vmode);
vram_remap = min_t(unsigned int, vram_remap, vram_total);
vram_remap = ROUNDUP(vram_vmode, 1 << L2_PAGETABLE_SHIFT);
vram_remap = min(vram_remap, vram_total);
}
void __init vesa_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment