2 files changed, 50 insertions, 2 deletions

diff --git a/meta-tegra-extras/recipes/linux/linux-tegra/jetson-tx2/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch b/meta-tegra-extras/recipes/linux/linux-tegra/jetson-tx2/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch
new file mode 100644
index 0000000..1bce6d7
--- /dev/null
+++ b/meta-tegra-extras/recipes/linux/linux-tegra/jetson-tx2/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch
@@ -0,0 +1,46 @@
+From 75a27373962e24424bcd2781568e6c6c5715ca92 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ilari=20=C3=84ngeslev=C3=A4?= <ilari.angesleva@qt.io>
+Date: Tue, 17 Oct 2017 14:13:02 +0300
+Subject: [PATCH] fbcon: Compare variable screen info instead of modes (FIX)
+
+Previous commit changed behavior, so that when trying to match a mode to a
+variable screen info structure, the mode was first converted to a variable
+screen structure rather than the variable screen info structure to a mode.
+
+However, when new mode was being added to the modelist, matching was still
+being done using mode structure. This could cause situation, where existing
+mode would match when comparing with mode structure, but not when compared
+using variable screen info structure. This would eventually result in a
+NULL pointer dereference in fbcon_switch.
+
+Fix the issue by using the variable screen info structure also when adding
+new mode to the modelist.
+---
+ drivers/video/fbdev/core/modedb.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/video/fbdev/core/modedb.c b/drivers/video/fbdev/core/modedb.c
+index f5a53a6..a8fd871 100644
+--- a/drivers/video/fbdev/core/modedb.c
++++ b/drivers/video/fbdev/core/modedb.c
+@@ -2187,13 +2187,14 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head)
+ {
+        struct list_head *pos;
+        struct fb_modelist *modelist;
+-       struct fb_videomode *m;
++       struct fb_var_screeninfo v1, v2;
+        int found = 0;
+ 
++       fb_videomode_to_var(&v1, mode);
+        list_for_each(pos, head) {
+                modelist = list_entry(pos, struct fb_modelist, list);
+-               m = &modelist->mode;
+-               if (fb_mode_is_equal(m, mode)) {
++               fb_videomode_to_var(&v2, &modelist->mode);
++               if (fb_var_is_equal(&v1, &v2)) {
+                        found = 1;
+                        break;
+                }
+-- 
+2.7.4
+
diff --git a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
index ae323cf..5b9f84b 100644
--- a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
+++ b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend
@@ -29,5 +29,7 @@
 
 PACKAGECONFIG += "kms"
 
-# Disable getentropy because of older than 3.17 kernel
-QT_CONFIG_FLAGS += "--no-feature-getentropy"
+# Disable getentropy for jetson-tx1 because of older than 3.17 kernel.
+# The kernel version in jetson-tx2 is 4.4.
+
+QT_CONFIG_FLAGS_append_jetson-tx1 = " --no-feature-getentropy"