From 9d4e53017385d548aaeec4d8e756ea263c26dc33 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 21 Feb 2022 14:53:57 +0100 Subject: [PATCH] xf86-video-imx-vivante: drop vivante specific x11 driver The required x11 driver stuff has been removed from imx-gpu-viv and thus the X11 driver is no longer buildable. Drop the recipe and fallback on the default X11 fb driver. | ERROR: Nothing RPROVIDES 'libvivante-dri-imx' (but .../meta-freescale/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb RDEPENDS on or otherwise requires it) Completes 747c96f5 ("imx-gpu-viv: Upgrade to 6.4.3.p2.4"). Signed-off-by: Max Krummenacher --- conf/machine/include/imx-base.inc | 1 - .../xf86-video-imx-vivante/rc.autohdmi | 42 ------------ .../xf86-video-imx-vivante_6.4.0.p0.0.bb | 65 ------------------- .../xserver-xf86-config/mx6-nxp-bsp/xorg.conf | 8 +-- 4 files changed, 3 insertions(+), 113 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index ba43d76e..c32402da 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -98,7 +98,6 @@ UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante" XSERVER_DRIVER:vf-generic-bsp = "xf86-video-modesetting" XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting" XSERVER_DRIVER:imx-mainline-bsp = " \ diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi deleted file mode 100644 index 8c16a1d7..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: rc.autohdmi -# Required-Start: $all -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -# Source function library. -. /etc/init.d/functions - -case "$1" in - start) - echo -n "Starting autohdmi: " - export DISPLAY=:0 - autohdmi & - echo - exit 0 - ;; - reload|force-reload) - echo "Error: argument '$1' not supported" >&2 - exit 3 - ;; - stop) - echo -n "Shutting down autohdmi: " - killproc autohdmi - echo - ;; - restart) - echo -n "Restarting autohdmi: " - $0 stop - $0 start - echo - ;; - *) - echo "Usage: $0 start|stop" >&2 - exit 3 - ;; -esac diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb deleted file mode 100644 index 1a272304..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2012-2018 O.S. Systems Software LTDA. -# Copyright 2017-2018 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -PE = "3" - -inherit autotools-brokensep update-rc.d pkgconfig - -DEPENDS += "virtual/xserver virtual/libx11 libgal-imx imx-gpu-viv virtual/libg2d pixman" - -LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" - -SRCREV = "c828e8a7c38743e960967e7bb78c134cec31c102" -SRCBRANCH = "imx_exa_viv6_g2d" -SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ - file://rc.autohdmi" - -S = "${WORKDIR}/git" - -INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi" -INITSCRIPT_NAME = "rc.autohdmi" -INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." - -EXTRA_OEMAKE += "prefix=${exec_prefix} \ - sysroot=${STAGING_DIR_TARGET} \ - SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ - BUSID_HAS_NUMBER=1 \ - BUILD_IN_YOCTO=1 \ - XSERVER_GREATER_THAN_13=1" -TARGET_CC_ARCH += "${LDFLAGS}" - -PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" - -do_install:append () { - install -d ${D}${includedir} - cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir} - cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir} - - install -d ${D}/${sysconfdir}/init.d - install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi - - find ${D}${includedir} -type f -exec chmod 660 {} \; -} - -RDEPENDS:${PN} += "libvivante-dri-imx \ - xserver-xorg-module-exa \ - mesa-driver-swrast \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx" - -REALSOLIBS := "${SOLIBS}" -SOLIBS = "${SOLIBSDEV}" - -FILES:${PN} = "${libdir}/*/*/*/vivante_drv${SOLIBS}" -FILES:${PN}-dev = "${includedir} /usr/src ${libdir}/libfsl_x11_ext${SOLIBSDEV}" -FILES:${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/.debug/autohdmi" - -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-nxp-bsp|mx7ulp-nxp-bsp)" diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf index b89bed60..79b6c0fc 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6-nxp-bsp/xorg.conf @@ -1,9 +1,7 @@ Section "Device" - Identifier "i.MX Accelerated Framebuffer Device" - Driver "vivante" - Option "fbdev" "/dev/fb0" - Option "vivante_fbdev" "/dev/fb0" - Option "HWcursor" "false" + Identifier "Kernel Framebuffer Device" + Driver "fbdev" + Option "fbdev" "/dev/fb0" EndSection Section "ServerFlags" -- 2.40.1