toradex: use the correct DRI device with KMS

The correct DRI device to be used with Qt varies with each
Toradex board. Fill the kms.conf with correct device based
on the selected target machine. The KMS is used with mx8,
but also when ever mainline bsp is used instead of NXP.

Pick-to: 6.2
Change-Id: I8872c752f7f13210d33ec061fc9125329388ec41
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>

6 files changed, 30 insertions, 41 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 3bfbbf78..e7e25789 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -59,6 +59,17 @@ GPULESS_FEATURES = "wayland opengl vulkan webengine"
 GPULESS_FEATURES:imxgpu = ""
 DISTRO_FEATURES:remove = "${GPULESS_FEATURES}"
 
+# Suitable DRI device
+DRI_DEVICE:apalis-imx6 = "card1"
+DRI_DEVICE:colibri-imx6 = "card1"
+DRI_DEVICE:colibri-imx7-emmc = "card0"
+DRI_DEVICE:apalis-imx8 = "card1"
+DRI_DEVICE:apalis-imx8x = "card0"
+DRI_DEVICE:colibri-imx8x = "card1"
+DRI_DEVICE:colibri-imx8x-v10b = "card1"
+DRI_DEVICE:verdin-imx8mm = "card0"
+DRI_DEVICE:verdin-imx8mp = "card0"
+
 # remove support for 256MB version colibri-imx6ull in tezi image, since image will be too large for it.
 TORADEX_PRODUCT_IDS:remove:colibri-imx6ull = "0036"
 
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
index 01cde71e..da56fa6b 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
@@ -29,7 +29,10 @@
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI:append:mx8 = " file://kms.conf"
+SRC_URI += "file://kms.conf.in"
+
+# Default DRI device to use with KMS
+DRI_DEVICE ?= "card0"
 
 do_configure:append() {
     echo "FB_MULTI_BUFFER=2" >> ${WORKDIR}/defaults
@@ -40,10 +43,19 @@ do_configure:append:mx8() {
     echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults
     echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults
     echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults
+    sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf
+}
+
+do_configure:append:use-mainline-bsp() {
+    echo "QT_QPA_EGLFS_KMS_ATOMIC=1" >> ${WORKDIR}/defaults
+    echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults
+    sed -e 's/@DEVICE@/${DRI_DEVICE}/' ${WORKDIR}/kms.conf.in > ${WORKDIR}/kms.conf
 }
 
-do_install:append:mx8() {
-    install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/
+do_install:append() {
+    if [ -e ${WORKDIR}/kms.conf ]; then
+        install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/
+    fi
 }
 
 do_configure:append:mx8mm() {
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf.in b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf.in
new file mode 100644
index 00000000..4cf3ba67
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf.in
@@ -0,0 +1,4 @@
+{
+  "hwcursor": false,
+  "device": "/dev/dri/@DEVICE@"
+}
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf
deleted file mode 100644
index 416a053e..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "hwcursor": false,
-  "device": "/dev/dri/card0"
-}
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
deleted file mode 100644
index 512a5f7a..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2021 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$
-##
-############################################################################
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf
deleted file mode 100644
index 19a208c0..00000000
--- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/default-qt-envs/mx8/kms.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "hwcursor": false,
-  "device": "/dev/dri/card1"
-}