From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 18 Feb 2022 13:46:27 +0000 (+0100)
Subject: video/vesa: adjust (not just) command line option handling
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~1008
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea140035d01afe28b896b6cb9848f2b2824d1bd2;p=xen.git

video/vesa: adjust (not just) command line option handling

Document the remaining option. Add section annotation to the variable
holding the parsed value as well as a few adjacent ones. Adjust the
types of font_height and vga_compat.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc
index ba5164eb64..321a9abfc1 100644
--- a/docs/misc/xen-command-line.pandoc
+++ b/docs/misc/xen-command-line.pandoc
@@ -2492,6 +2492,11 @@ cache-warming. 1ms (1000) has been measured as a good value.
 ### vesa-ram
 > `= <integer>`
 
+> Default: `0`
+
+This allows to override the amount of video RAM, in MiB, determined to be
+present.
+
 ### vga
 > `= ( ask | current | text-80x<rows> | gfx-<width>x<height>x<depth> | mode-<mode> )[,keep]`
 
diff --git a/xen/drivers/video/vesa.c b/xen/drivers/video/vesa.c
index 8ff1b1d4ea..0342a3dede 100644
--- a/xen/drivers/video/vesa.c
+++ b/xen/drivers/video/vesa.c
@@ -19,16 +19,16 @@
 
 static void lfb_flush(void);
 
-static unsigned char *lfb;
-static const struct font_desc *font;
-static bool_t vga_compat;
+static unsigned char *__read_mostly lfb;
+static const struct font_desc *__initdata font;
+static bool __initdata vga_compat;
 
-static unsigned int vram_total;
+static unsigned int __initdata vram_total;
 integer_param("vesa-ram", vram_total);
 
 static unsigned int __initdata vram_remap;
 
-static int font_height;
+static unsigned int __initdata font_height;
 static int __init parse_font_height(const char *s)
 {
     if ( simple_strtoul(s, &s, 10) == 8 && (*s++ == 'x') )