mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
1e37959e53
* Prepare xu4 edge for 5.16.y, move current of imx6 to 5.15.y and edge to 5.16.y - fix bootsplash on 5.16.y * rk322x: advance current to 5.15 and edge to 5.16 * rockchip: advance current kernel to 5.15, edge to 5.16 * - adjust configs - fix bootsplash patches - adjust aufs * Switch sunxi / sunxi64 current to 5.15.y, edge to 5.16.y - cleanup bootsplash patches - adjust configs * Update mvebu64 Co-authored-by: Paolo Sabatino <paolo.sabatino@gmail.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 1703e0e113025614c66dee8eb575aa67861934cd Mon Sep 17 00:00:00 2001
|
|
From: Igor Pecovnik <igor.pecovnik@gmail.com>
|
|
Date: Thu, 10 Feb 2022 19:26:33 +0100
|
|
Subject: [PATCH] Revert "fbcon: remove no-op fbcon_set_origin()"
|
|
|
|
This reverts commit bfeb28539d1f61829232883ced0986569218c4de.
|
|
---
|
|
drivers/video/fbdev/core/fbcon.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
|
|
index ad0862d6c1a9..6fea22c4642c 100644
|
|
--- a/drivers/video/fbdev/core/fbcon.c
|
|
+++ b/drivers/video/fbdev/core/fbcon.c
|
|
@@ -163,6 +163,8 @@ static const struct consw fb_con;
|
|
|
|
#define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row)
|
|
|
|
+static int fbcon_set_origin(struct vc_data *);
|
|
+
|
|
static int fbcon_cursor_noblink;
|
|
|
|
#define divides(a, b) ((!(a) || (b)%(a)) ? 0 : 1)
|
|
@@ -2633,6 +2635,11 @@ static void fbcon_invert_region(struct vc_data *vc, u16 * p, int cnt)
|
|
}
|
|
}
|
|
|
|
+static int fbcon_set_origin(struct vc_data *vc)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+
|
|
void fbcon_suspended(struct fb_info *info)
|
|
{
|
|
struct vc_data *vc = NULL;
|
|
@@ -3103,6 +3110,7 @@ static const struct consw fb_con = {
|
|
.con_font_default = fbcon_set_def_font,
|
|
.con_font_copy = fbcon_copy_font,
|
|
.con_set_palette = fbcon_set_palette,
|
|
+ .con_set_origin = fbcon_set_origin,
|
|
.con_invert_region = fbcon_invert_region,
|
|
.con_screen_pos = fbcon_screen_pos,
|
|
.con_getxy = fbcon_getxy,
|
|
--
|
|
2.25.1
|
|
|