e21e82b546
* Upgrading sunxi and sunxi64 EDGE to 5.13 Both variants tested for building * Bump imx6 to 5.13.y Tested * Bump Jetson nano kernel to 5.13.y * Move mvebu and mvebu64 edge to 5.13.y
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From d8eb6e5e70ba30717bb8aea4390c112cb8892e1b Mon Sep 17 00:00:00 2001
|
|
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
|
Date: Tue, 20 Jul 2021 17:38:53 +0000
|
|
Subject: [PATCH] Revert "vgacon: drop unused vga_init_done"
|
|
|
|
This reverts commit 0ae798fd96f8c28850e09d22d3f0d455071ed8eb.
|
|
---
|
|
drivers/video/console/vgacon.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
|
|
index ef9c57ce0906..8cba9f46ddf9 100644
|
|
--- a/drivers/video/console/vgacon.c
|
|
+++ b/drivers/video/console/vgacon.c
|
|
@@ -79,6 +79,7 @@ static struct uni_pagedir *vgacon_uni_pagedir;
|
|
static int vgacon_refcount;
|
|
|
|
/* Description of the hardware situation */
|
|
+static bool vga_init_done;
|
|
static unsigned long vga_vram_base __read_mostly; /* Base of video memory */
|
|
static unsigned long vga_vram_end __read_mostly; /* End of video memory */
|
|
static unsigned int vga_vram_size __read_mostly; /* Size of video memory */
|
|
@@ -358,6 +359,8 @@ static const char *vgacon_startup(void)
|
|
vgacon_xres = screen_info.orig_video_cols * VGA_FONTWIDTH;
|
|
vgacon_yres = vga_scan_lines;
|
|
|
|
+ vga_init_done = true;
|
|
+
|
|
return display_desc;
|
|
}
|
|
|
|
--
|
|
2.30.2
|
|
|