From b2ad8c55f806ff3c5b1b9c1f628c8740d9f28534 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 7 Nov 2017 16:32:24 +0200 Subject: jetson: update to Linux For Tegra R28.1 Use the latest release for Jetson TX1 and TX2. Task-number: QTBUG-64136 Change-Id: I39bb2592a20694befc721b202ee3f7b33623ee1d Reviewed-by: Mikko Gronoff --- conf/distro/include/jetson.inc | 5 ++- meta-tegra-extras/recipes/drm/libdrm_%.bbappend | 32 --------------- ...re-variable-screen-info-instead-of-modes-.patch | 12 +++--- ...re-variable-screen-info-instead-of-modes-.patch | 46 ---------------------- meta-tegra-extras/recipes/qt5/qtbase_git.bbappend | 7 +--- .../tegra-binaries/tegra-libraries_%.bbappend | 6 --- scripts/manifest.xml | 2 +- 7 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 meta-tegra-extras/recipes/drm/libdrm_%.bbappend delete mode 100644 meta-tegra-extras/recipes/linux/linux-tegra/jetson-tx2/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch diff --git a/conf/distro/include/jetson.inc b/conf/distro/include/jetson.inc index 00a7bf8..98c71f4 100644 --- a/conf/distro/include/jetson.inc +++ b/conf/distro/include/jetson.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,8 +27,9 @@ ## ############################################################################ -# use mmc0 +PREFERRED_PROVIDER_libdrm-tegra = "libdrm-tegra" +# use mmc0 ROOTFS_DEVICE = "mmcblk1p1" INITRAMFS_MAXSIZE = "165888" diff --git a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend b/meta-tegra-extras/recipes/drm/libdrm_%.bbappend deleted file mode 100644 index 940c931..0000000 --- a/meta-tegra-extras/recipes/drm/libdrm_%.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -do_install_append() { - rm -f ${D}${libdir}/libdrm.so.2 -} diff --git a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch b/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch index c700e0e..dd58eed 100644 --- a/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch +++ b/meta-tegra-extras/recipes/linux/linux-tegra/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch @@ -16,14 +16,14 @@ 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/modedb.c | 7 ++++--- + drivers/video/fbdev/core/modedb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c -index 12dadab..e5093cf 100644 ---- a/drivers/video/modedb.c -+++ b/drivers/video/modedb.c -@@ -2190,13 +2190,14 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head) +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; 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 deleted file mode 100644 index 1bce6d7..0000000 --- a/meta-tegra-extras/recipes/linux/linux-tegra/jetson-tx2/0001-fbcon-Compare-variable-screen-info-instead-of-modes-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 75a27373962e24424bcd2781568e6c6c5715ca92 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ilari=20=C3=84ngeslev=C3=A4?= -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 5b9f84b..d48d6ac 100644 --- a/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend +++ b/meta-tegra-extras/recipes/qt5/qtbase_git.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -28,8 +28,3 @@ ############################################################################ PACKAGECONFIG += "kms" - -# 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" diff --git a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend index 1f375e6..84a817c 100644 --- a/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend +++ b/meta-tegra-extras/recipes/tegra-binaries/tegra-libraries_%.bbappend @@ -27,8 +27,6 @@ ## ############################################################################ -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa', '', d)}" - PACKAGES += "${PN}-dev" RRECOMMENDS_${PN}-dev += "\ libgles1-mesa-dev \ @@ -37,7 +35,3 @@ RRECOMMENDS_${PN}-dev += "\ libegl-mesa-dev \ libgl-mesa-dev \ " - -do_install_append() { - install -m 0644 ${DRVROOT}/tegra/libdrm* ${D}${libdir} -} diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1fcd1b3..fd0422a 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -58,7 +58,7 @@ groups="notdefault,external,intel"/>