From 322e23dc213d51a12345ca705b3776f189dc413f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 15 Dec 2021 13:52:16 -0800 Subject: Initial restructure/split of meta-xilinx-bsp Create a new meta-xilinx-core, move core functionality to the core, keeping board specific files in the bsp layer. zynqmp-generic changed from require to include, so if meta-xilinx-bsp is not available it will not fail. Signed-off-by: Mark Hatle --- ...ton-Remove-substitute-format-for-ARGB8888.patch | 29 ++++++++++++++++++++++ .../recipes-graphics/wayland/files/weston.ini | 6 +++++ .../recipes-graphics/wayland/weston-init%.bbappend | 7 ++++++ .../recipes-graphics/wayland/weston_%.bbappend | 14 +++++++++++ 4 files changed, 56 insertions(+) create mode 100644 meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch create mode 100644 meta-xilinx-core/recipes-graphics/wayland/files/weston.ini create mode 100644 meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend create mode 100644 meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend (limited to 'meta-xilinx-core/recipes-graphics/wayland') diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch new file mode 100644 index 00000000..33d33b0f --- /dev/null +++ b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch @@ -0,0 +1,29 @@ +From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001 +From: Madhurkiran Harikrishnan +Date: Fri, 11 Dec 2020 16:21:38 -0800 +Subject: [PATCH] libweston: Remove substitute format for ARGB8888 + +Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same +as opaque substitute. + +Signed-off-by: Madhurkiran Harikrishnan +Upstream-Status : Inappropriate [Xilinx specific] +--- + libweston/pixel-formats.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c +index 79dc709..ec2d3b7 100644 +--- a/libweston/pixel-formats.c ++++ b/libweston/pixel-formats.c +@@ -193,7 +193,6 @@ static const struct pixel_format_info pixel_format_table[] = { + { + DRM_FORMAT(ARGB8888), + BITS_RGBA_FIXED(8, 8, 8, 8), +- .opaque_substitute = DRM_FORMAT_XRGB8888, + .depth = 32, + .bpp = 32, + GL_FORMAT(GL_BGRA_EXT), +-- +2.17.1 + diff --git a/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini b/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini new file mode 100644 index 00000000..2ff81795 --- /dev/null +++ b/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini @@ -0,0 +1,6 @@ +[core] +idle-time=0 + +gbm-format=rgb565 + +require-input=false diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend new file mode 100644 index 00000000..ba570d44 --- /dev/null +++ b/meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" + +SRC_URI:append:zynqmp = " file://weston.ini" + +do_install:append:zynqmp() { + install -Dm 0700 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/weston.ini +} diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend new file mode 100644 index 00000000..caa49063 --- /dev/null +++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" + +SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" + +# OpenGL comes from libmali on ev/eg, when egl is enabled +DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}" + +# Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific +SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}" +ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}" +# But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali +ZYNQMP_PKGARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}" + +PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}" -- cgit v1.2.3-54-g00ecf