4.4-stable patches

added patches:
	fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index 94567c69c84187dee50c0eb10a21273160eb0f2b..953ff4349ba1c6558e62b840da890a87cd2d1547 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -29,3 +29,4 @@ epoll-epoll_ctl_add-close-the-race-in-decision-to-take-fast-path.patch
 ep_create_wakeup_source-dentry-name-can-change-under-you.patch
 netfilter-ctnetlink-add-a-range-check-for-l3-l4-protonum.patch
 drm-syncobj-fix-drm_syncobj_handle_to_fd-refcount-leak.patch
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..aa2cb3a
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-4.4/fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch b/queue-4.4/fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch
new file mode 100644 (file)
index 0000000..5eab57d
--- /dev/null
+++ b/queue-4.4/fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch
@@ -0,0 +1,105 @@
+From bb0890b4cd7f8203e3aa99c6d0f062d6acdaad27 Mon Sep 17 00:00:00 2001
+From: Peilin Ye <yepeilin.cs@gmail.com>
+Date: Thu, 24 Sep 2020 09:40:53 -0400
+Subject: fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
+
+From: Peilin Ye <yepeilin.cs@gmail.com>
+
+commit bb0890b4cd7f8203e3aa99c6d0f062d6acdaad27 upstream.
+
+drivers/video/console/newport_con.c is borrowing FONT_EXTRA_WORDS macros
+from drivers/video/fbdev/core/fbcon.h. To keep things simple, move all
+definitions into <linux/font.h>.
+
+Since newport_con now uses four extra words, initialize the fourth word in
+newport_set_font() properly.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
+Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/7fb8bc9b0abc676ada6b7ac0e0bd443499357267.1600953813.git.yepeilin.cs@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/video/console/fbcon.h        |    7 -------
+ drivers/video/console/fbcon_rotate.c |    1 +
+ drivers/video/console/newport_con.c  |    7 +------
+ drivers/video/console/tileblit.c     |    1 +
+ include/linux/font.h                 |    8 ++++++++
+ 5 files changed, 11 insertions(+), 13 deletions(-)
+
+--- a/drivers/video/console/fbcon.h
++++ b/drivers/video/console/fbcon.h
+@@ -151,13 +151,6 @@ static inline int attr_col_ec(int shift,
+ #define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0)
+ #define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1)
+ 
+-/* Font */
+-#define REFCOUNT(fd)  (((int *)(fd))[-1])
+-#define FNTSIZE(fd)   (((int *)(fd))[-2])
+-#define FNTCHARCNT(fd)        (((int *)(fd))[-3])
+-#define FNTSUM(fd)    (((int *)(fd))[-4])
+-#define FONT_EXTRA_WORDS 4
+-
+     /*
+      *  Scroll Method
+      */
+--- a/drivers/video/console/fbcon_rotate.c
++++ b/drivers/video/console/fbcon_rotate.c
+@@ -14,6 +14,7 @@
+ #include <linux/fb.h>
+ #include <linux/vt_kern.h>
+ #include <linux/console.h>
++#include <linux/font.h>
+ #include <asm/types.h>
+ #include "fbcon.h"
+ #include "fbcon_rotate.h"
+--- a/drivers/video/console/newport_con.c
++++ b/drivers/video/console/newport_con.c
+@@ -35,12 +35,6 @@
+ 
+ #define FONT_DATA ((unsigned char *)font_vga_8x16.data)
+ 
+-/* borrowed from fbcon.c */
+-#define REFCOUNT(fd)  (((int *)(fd))[-1])
+-#define FNTSIZE(fd)   (((int *)(fd))[-2])
+-#define FNTCHARCNT(fd)        (((int *)(fd))[-3])
+-#define FONT_EXTRA_WORDS 3
+-
+ static unsigned char *font_data[MAX_NR_CONSOLES];
+ 
+ static struct newport_regs *npregs;
+@@ -522,6 +516,7 @@ static int newport_set_font(int unit, st
+       FNTSIZE(new_data) = size;
+       FNTCHARCNT(new_data) = op->charcount;
+       REFCOUNT(new_data) = 0; /* usage counter */
++      FNTSUM(new_data) = 0;
+ 
+       p = new_data;
+       for (i = 0; i < op->charcount; i++) {
+--- a/drivers/video/console/tileblit.c
++++ b/drivers/video/console/tileblit.c
+@@ -13,6 +13,7 @@
+ #include <linux/fb.h>
+ #include <linux/vt_kern.h>
+ #include <linux/console.h>
++#include <linux/font.h>
+ #include <asm/types.h>
+ #include "fbcon.h"
+ 
+--- a/include/linux/font.h
++++ b/include/linux/font.h
+@@ -57,4 +57,12 @@ extern const struct font_desc *get_defau
+ /* Max. length for the name of a predefined font */
+ #define MAX_FONT_NAME 32
+ 
++/* Extra word getters */
++#define REFCOUNT(fd)  (((int *)(fd))[-1])
++#define FNTSIZE(fd)   (((int *)(fd))[-2])
++#define FNTCHARCNT(fd)        (((int *)(fd))[-3])
++#define FNTSUM(fd)    (((int *)(fd))[-4])
++
++#define FONT_EXTRA_WORDS 4
++
+ #endif /* _VIDEO_FONT_H */

diff --git a/queue-4.4/series b/queue-4.4/series
index f7a7e9ff1e595de903670bb7125f39b1395acd40..7293e4506936264ad3ebc75a8ca78c8cc02bf2c2 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -14,3 +14,4 @@ epoll-replace-visited-visited_list-with-generation-count.patch
 epoll-epoll_ctl_add-close-the-race-in-decision-to-take-fast-path.patch
 ep_create_wakeup_source-dentry-name-can-change-under-you.patch
 netfilter-ctnetlink-add-a-range-check-for-l3-l4-protonum.patch
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 342d29ad17d51a59852ef7837649bc50f245f1f8..968147fe764b72aaa0121dc8e7dded5bcfb6500d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -20,3 +20,4 @@ epoll-replace-visited-visited_list-with-generation-count.patch
 epoll-epoll_ctl_add-close-the-race-in-decision-to-take-fast-path.patch
 ep_create_wakeup_source-dentry-name-can-change-under-you.patch
 netfilter-ctnetlink-add-a-range-check-for-l3-l4-protonum.patch
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..aa2cb3a
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1 @@
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch

diff --git a/queue-5.8/series b/queue-5.8/series
new file mode 100644 (file)
index 0000000..aa2cb3a
--- /dev/null
+++ b/queue-5.8/series
@@ -0,0 +1 @@
+fbdev-newport_con-move-font_extra_words-macros-into-linux-font.h.patch