diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc index 5c32f1f98..1db4d40ce 100644 --- a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc +++ b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc @@ -65,4 +65,4 @@ FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB FILES_xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi" PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6|mx7ulp)" +COMPATIBLE_MACHINE = "(mx6|mx8|mx7ulp)" diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf index ec12ed9bc..24ebbadc8 100644 --- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf +++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xf86-config/imxdrm/xorg.conf @@ -2,6 +2,7 @@ Section "Device" Identifier "i.MX Accelerated DRM Device" Driver "vivante" Option "kmsdev" "/dev/dri/card0" + Option "fbdev" "/dev/fb0" EndSection Section "ServerFlags" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh index a1aa3af34..64a323fb1 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh @@ -1,5 +1,9 @@ #!/bin/sh export QT_QPA_PLATFORM="wayland" -# Use EGLFS platform plugin for images without XWayland -[ -f "/etc/profile.d/weston.sh" ] || export QT_QPA_PLATFORM="eglfs" +[ -f "/etc/profile.d/weston.sh" ] && exit 0 + +export QT_QPA_PLATFORM="xcb" + +# Use EGLFS platform plugin for images without XWayland and X11 +[ -f "/etc/xserver-nodm/Xserver" ] || export QT_QPA_PLATFORM="eglfs"