linux-raspberrypi_4.4.bb: support for .dtbo files for dtb overlays
PATCH 1/23 linux-raspberrypi_4.4.bb: support for .dtbo files for dtb overlays
From: Herve Jourdain <[email protected]>
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. Patch the kernel, which has faulty rules to generate .dtbo the way yocto does
--- .../0001-fix-dtbo-rules.patch | 44 ++++++++++++++++++++++ recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001 +From: Herve Jourdain <[email protected]> +Date: Fri, 20 May 2016 16:02:23 +0800 +Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc: + support for .dtbo files for dtb overlays + +Upstream-Status: Pending + +Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. +Patch the kernel, which has faulty rules to generate .dtbo the way yocto does + +Signed-off-by: Herve Jourdain <[email protected]> +--- + .../0001-fix-dtbo-rules.patch | 27 ++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch + +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index a2e7cf7..673c1cb 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -333,6 +333,8 @@ $(INSTALL_TARGETS): + + %.dtb: | scripts + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ + + PHONY += dtbs dtbs_install + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 3079c4f..6cc3766 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + + quiet_cmd_dtco = DTCO $@ +-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ ++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ ++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ + -d $(depfile).dtc.tmp $(dtc-tmp) ; \
recipes-kernel/linux/linux-raspberrypi_4.4.bb +1 -0
@@ -4,5 +4,6 @@ LINUX_VERSION ?= "4.4.13" SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ + file://0001-fix-dtbo-rules.patch \ " require linux-raspberrypi.inc
Signature · 1 line
2.9.2
PATCH 2/23 rpi-base.inc: support for .dtbo files for dtb overlays
From: Herve Jourdain <[email protected]>
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
Add support for .dtbo variant of overlays for the default KERNEL_DEVICETREE variable
(the list will be turned into "-overlay.dtb" by linux-raspberry-base.bbclass, if needed, depending on the kernel version)
--- conf/machine/include/rpi-base.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
conf/machine/include/rpi-base.inc +15 -15
@@ -22,21 +22,21 @@ KERNEL_DEVICETREE ?= " \ bcm2709-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ \ - overlays/hifiberry-amp-overlay.dtb \ - overlays/hifiberry-dac-overlay.dtb \ - overlays/hifiberry-dacplus-overlay.dtb \ - overlays/hifiberry-digi-overlay.dtb \ - overlays/i2c-rtc-overlay.dtb \ - overlays/iqaudio-dac-overlay.dtb \ - overlays/iqaudio-dacplus-overlay.dtb \ - overlays/lirc-rpi-overlay.dtb \ - overlays/pitft22-overlay.dtb \ - overlays/pitft28-resistive-overlay.dtb \ - overlays/pps-gpio-overlay.dtb \ - overlays/rpi-ft5406-overlay.dtb \ - overlays/w1-gpio-overlay.dtb \ - overlays/w1-gpio-pullup-overlay.dtb \ - overlays/pi3-miniuart-bt-overlay.dtb \ + overlays/hifiberry-amp.dtbo \ + overlays/hifiberry-dac.dtbo \ + overlays/hifiberry-dacplus.dtbo \ + overlays/hifiberry-digi.dtbo \ + overlays/i2c-rtc.dtbo \ + overlays/iqaudio-dac.dtbo \ + overlays/iqaudio-dacplus.dtbo \ + overlays/lirc-rpi.dtbo \ + overlays/pitft22.dtbo \ + overlays/pitft28-resistive.dtbo \ + overlays/pps-gpio.dtbo \ + overlays/rpi-ft5406.dtbo \ + overlays/w1-gpio.dtbo \ + overlays/w1-gpio-pullup.dtbo \ + overlays/pi3-miniuart-bt.dtbo \ " KERNEL_IMAGETYPE ?= "Image"
Signature · 1 line
2.9.2
PATCH 3/23 linux-raspberrypi-base.bbclass: support for .dtbo files for dtb overlays
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. Add support for both variants of overlays ("-overlay.dtb" and ".dtbo") Change which variant needs to be supported based on the kernel version
CAUTION: when called from IMAGE_CMD_rpi-sdimg, 'TMPDIR' is not set, causing 'STAGING_KERNEL_BUILDDIR' to not be expanded, causing get_kernelversion_file() to fail! To avoid this problem, get_dts() and split_overlays() MUST be called with the kernel version parameter set, when called from IMAGE_CMD_rpi-sdimg!
--- classes/linux-raspberrypi-base.bbclass | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
classes/linux-raspberrypi-base.bbclass +12 -7
@@ -1,7 +1,8 @@ inherit linux-kernel-base - def get_dts(d, ver): + import re + staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True) dts = d.getVar("KERNEL_DEVICETREE", True)
@@ -20,20 +21,24 @@ def get_dts(d, ver): # Always turn off device tree support for kernel's < 3.18 try: - if int(min_ver[0]) <= 3: - if int(min_ver[1]) < 18: - dts = "" + if int(min_ver[0]) >= 4: + if (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and int(min_ver[2]) < 6): + dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x)) for x in dts.split()]) + elif int(min_ver[1]) < 18: + dts = "" except IndexError: min_ver = None return dts -def split_overlays(d, out): - dts = get_dts(d, None) +def split_overlays(d, ver, out): + dts = get_dts(d, ver) if out: overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) + overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) else: - overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ + " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) return overlays
Signature · 1 line
2.9.2
PATCH 4/23 sdcard_image-rpi.bbclass: support for .dtbo files for dtb overlays
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. Add support for both extensions for overlays (".dtb" and ".dtbo")
CAUTION: in IMAGE_CMD_rpi-sdimg, 'TMPDIR' is not set, causing 'STAGING_KERNEL_BUILDDIR' to not be expanded, causing get_dts() to not being able to get the kernel version! To avoid this problem, the kernel version is added in a new variable outside the scope of IMAGE_CMD_rpi-sdimg, and its value passed to get_dts() and split_overlays()!
--- classes/sdcard_image-rpi.bbclass | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
classes/sdcard_image-rpi.bbclass +9 -6
@@ -75,6 +75,8 @@ IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" IMAGE_CMD_rpi-sdimg[vardepsexclude] += "IMAGEDATESTAMP" IMAGE_CMD_rpi-sdimg[vardepsexclude] += "DATETIME" +RPI_KERNEL_VERSION := "${@get_kernelversion_file('${STAGING_KERNEL_BUILDDIR}')}" + IMAGE_CMD_rpi-sdimg () { # Align partitions
@@ -85,7 +87,7 @@ IMAGE_CMD_rpi-sdimg () { echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" # Check if we are building with device tree support - DTS="${@get_dts(d, None)}" + DTS="${@get_dts(d, '${RPI_KERNEL_VERSION}')}" # Initialize sdcard image file dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
@@ -105,9 +107,9 @@ IMAGE_CMD_rpi-sdimg () { mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ if test -n "${DTS}"; then - # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder - DT_OVERLAYS="${@split_overlays(d, 0)}" - DT_ROOT="${@split_overlays(d, 1)}" + # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder + DT_OVERLAYS="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 0)}" + DT_ROOT="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 1)}" # Copy board device trees to root folder for DTB in ${DT_ROOT}; do
@@ -119,9 +121,10 @@ IMAGE_CMD_rpi-sdimg () { # Copy device tree overlays to dedicated folder mmd -i ${WORKDIR}/boot.img overlays for DTB in ${DT_OVERLAYS}; do - DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT} done fi case "${KERNEL_IMAGETYPE}" in
Signature · 1 line
2.9.2
PATCH 5/23 rpi-default-providers.inc: change default providers to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/include/rpi-default-providers.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
conf/machine/include/rpi-default-providers.inc +4 -4
@@ -2,8 +2,8 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "userland" -PREFERRED_PROVIDER_virtual/libgles2 ?= "userland" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl" -PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}" +PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" +PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}" PREFERRED_PROVIDER_jpeg ?= "jpeg"
Signature · 1 line
2.9.2
PATCH 6/23 rpi-base.inc: add vc4-kms-v3d to the overlays to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/include/rpi-base.inc | 1 + 1 file changed, 1 insertion(+)
conf/machine/include/rpi-base.inc +1 -0
@@ -37,6 +37,7 @@ KERNEL_DEVICETREE ?= " \ overlays/w1-gpio.dtbo \ overlays/w1-gpio-pullup.dtbo \ overlays/pi3-miniuart-bt.dtbo \ + overlays/vc4-kms-v3d.dtbo \ " KERNEL_IMAGETYPE ?= "Image"
Signature · 1 line
2.9.2
PATCH 7/23 raspberrypi.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/raspberrypi.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/raspberrypi.conf +2 -0
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_config" +VC4_CMA_SIZE_raspberrypi ?= "cma-64" +
Signature · 1 line
2.9.2
PATCH 8/23 raspberrypi0.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/raspberrypi0.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/raspberrypi0.conf +2 -0
@@ -6,3 +6,5 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}" include conf/machine/raspberrypi.conf SERIAL_CONSOLE = "115200 ttyAMA0" +VC4_CMA_SIZE ?= "cma-128" +
Signature · 1 line
2.9.2
PATCH 9/23 raspberrypi2.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/raspberrypi2.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/raspberrypi2.conf +2 -0
@@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_2_config" +VC4_CMA_SIZE ?= "cma-256" +
Signature · 1 line
2.9.2
PATCH 10/23 raspberrypi3.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- conf/machine/raspberrypi3.conf | 2 ++ 1 file changed, 2 insertions(+)
conf/machine/raspberrypi3.conf +2 -0
@@ -9,3 +9,5 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430" include conf/machine/raspberrypi2.conf SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" +
Signature · 1 line
2.9.2
PATCH 11/23 rpi-config_git.bb: add v4c overlay to config.txt to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- recipes-bsp/bootfiles/rpi-config_git.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
recipes-bsp/bootfiles/rpi-config_git.bb +9 -1
@@ -13,12 +13,14 @@ SRC_URI = "git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \ S = "${WORKDIR}/git" -PR = "r4" +PR = "r5" PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}" PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}" +VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" + inherit deploy do_deploy() {
@@ -102,6 +104,12 @@ do_deploy() { echo "# Enable UART" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt echo "enable_uart=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt fi + + # VC4 Graphics support + if [ "${VC4GRAPHICS}" = "1" ]; then + echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "dtoverlay=vc4-kms-v3d,${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt + fi } addtask deploy before do_package after do_install
Signature · 1 line
2.9.2
PATCH 12/23 wayland/weston_%.bbappend: modify configuration options to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- recipes-graphics/wayland/weston_%.bbappend | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
recipes-graphics/wayland/weston_%.bbappend +2 -4
@@ -1,4 +1,2 @@ -EXTRA_OECONF_append_rpi = "\ - --enable-rpi-compositor \ - WESTON_NATIVE_BACKEND=rpi-backend.so \ - " +EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" +
Signature · 1 line
2.9.2
PATCH 13/23 weston/weston_%.bbappend: modify configuration options to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- recipes-graphics/weston/weston_%.bbappend | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
recipes-graphics/weston/weston_%.bbappend +7 -6
@@ -1,7 +1,8 @@ -EXTRA_OECONF += "--enable-rpi-compositor \ - --disable-resize-optimization \ - --disable-setuid-install \ - --disable-xwayland-test \ - --disable-simple-egl-clients \ - WESTON_NATIVE_BACKEND=rpi-backend.so \ +PACKAGECONFIG_rpi_remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' fbdev', '', d)}" +EXTRA_OECONF += "--disable-xwayland-test \ + --disable-simple-egl-clients \ " +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}" +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}" +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}" +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
Signature · 1 line
2.9.2
PATCH 14/23 mesa_%.bbappend: new file to add the correct configuration options to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- recipes-graphics/mesa/mesa_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes-graphics/mesa/mesa_%.bbappend
recipes-graphics/mesa/mesa_%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +PACKAGECONFIG_append_rpi = " gallium" +GALLIUMDRIVERS_rpi = "vc4" +DRIDRIVERS_rpi = "" +
Signature · 1 line
2.9.2
PATCH 15/23 linux-rpi.inc: add the configuration options required to support vc4graphics
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- recipes-kernel/linux/linux-rpi.inc | 10 ++++++++++ 1 file changed, 10 insertions(+)
recipes-kernel/linux/linux-rpi.inc +10 -0
@@ -111,6 +111,16 @@ do_configure_prepend() { # Activate CONFIG_LEGACY_PTYS kernel_configure_variable LEGACY_PTYS y + # Activate the configuration options for VC4 + VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" + if [ ${VC4GRAPHICS} = "1" ]; then + kernel_configure_variable I2C_BCM2835 y + kernel_configure_variable DRM y + kernel_configure_variable DRM_FBDEV_EMULATION n + kernel_configure_variable DRM_VC4 y + kernel_configure_variable FB_BCM2708 n + fi + # Keep this the last line # Remove all modified configs and add the rest to .config sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
Signature · 1 line
2.9.2
PATCH 16/23 linux-raspberrypi-4.4: add patch to enable proper operation of renderD128 device
In reply to Khem RajFrom: Herve Jourdain <[email protected]>
--- .../0002-vc4-ioctl-rendering-allow.patch | 29 ++++++++++++++++++++++ recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch new file +29 -0
@@ -0,0 +1,29 @@ +This patch has been accepted upstream in kernel 4.7-rc3 +But it has not yet been backported to 4.4... +Upstream-Status: Accepted [http://www.gossamer-threads.com/lists/linux/kernel/2459302] +Signed-off-by: Herve Jourdain <[email protected]> +--- + +diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c +index a5b68c1..14b5ec1 100644 +--- a/drivers/gpu/drm/vc4/vc4_drv.c ++++ b/drivers/gpu/drm/vc4/vc4_drv.c +@@ -75,12 +75,12 @@ static const struct file_operations vc4_drm_fops = { + }; + + static const struct drm_ioctl_desc vc4_drm_ioctls[] = { +- DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0), +- DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0), +- DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0), +- DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0), +- DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0), +- DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0), ++ DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0|DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0|DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0|DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0|DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0|DRM_RENDER_ALLOW), ++ DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0|DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl, + DRM_ROOT_ONLY), + };
recipes-kernel/linux/linux-raspberrypi_4.4.bb +1 -0
@@ -5,5 +5,6 @@ LINUX_VERSION ?= "4.4.13" SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ file://0001-fix-dtbo-rules.patch \ + file://0002-vc4-ioctl-rendering-allow.patch \ " require linux-raspberrypi.inc
Signature · 1 line
2.9.2
PATCH 17/23 linux-raspberrypi_4.4: upgrade to 4.4.16
In reply to Khem Raj--- recipes-kernel/linux/linux-raspberrypi_4.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-kernel/linux/linux-raspberrypi_4.4.bb +2 -2
@@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.4.13" +LINUX_VERSION ?= "4.4.16" -SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13" +SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ file://0001-fix-dtbo-rules.patch \ file://0002-vc4-ioctl-rendering-allow.patch \
Signature · 1 line
2.9.2
Re: [meta-raspberrypi][PATCH 17/23] linux-raspberrypi_4.4: upgrade to 4.4.16
Quoted 23 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-kernel/linux/linux-raspberrypi_4.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)recipes-kernel/linux/linux-raspberrypi_4.4.bb +2
-3@@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -LINUX_VERSION ?= "4.4.13" +LINUX_VERSION ?= "4.4.16" -SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13" +SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a" SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \ file://0001-fix-dtbo-rules.patch \ file://0002-vc4-ioctl-rendering-allow.patch \ --2.9.2
Quoted 5 lines
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Merged paches 17-24 form this set. All the rest where already in master from previous merged. Thanks.
--
Andrei Gherzan
PATCH 18/23 linux-raspberrypi: Add recipe for 4.7 release
In reply to Khem Raj--- .../0001-fix-dtbo-rules.patch | 44 ++++++++++++++++++++++ recipes-kernel/linux/linux-raspberrypi_4.7.bb | 9 +++++ 2 files changed, 53 insertions(+) create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch create mode 100644 recipes-kernel/linux/linux-raspberrypi_4.7.bb
recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001 +From: Herve Jourdain <[email protected]> +Date: Fri, 20 May 2016 16:02:23 +0800 +Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc: + support for .dtbo files for dtb overlays + +Upstream-Status: Pending + +Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. +Patch the kernel, which has faulty rules to generate .dtbo the way yocto does + +Signed-off-by: Herve Jourdain <[email protected]> +--- + .../0001-fix-dtbo-rules.patch | 27 ++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + create mode 100644 recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch + +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index a2e7cf7..673c1cb 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -333,6 +333,8 @@ $(INSTALL_TARGETS): + + %.dtb: | scripts + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ ++%.dtbo: | scripts ++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ + + PHONY += dtbs dtbs_install + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 3079c4f..6cc3766 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE + $(call if_changed_dep,dtc) + + quiet_cmd_dtco = DTCO $@ +-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ ++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \ ++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ + $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ + -d $(depfile).dtc.tmp $(dtc-tmp) ; \
recipes-kernel/linux/linux-raspberrypi_4.7.bb new file +9 -0
@@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" + +LINUX_VERSION ?= "4.7.0" + +SRCREV = "d38b45a21294eaf01aa7568aaeb161d7553477e9" +SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.7.y \ + file://0001-fix-dtbo-rules.patch \ +" +require linux-raspberrypi.inc
Signature · 1 line
2.9.2
PATCH 19/23 linux-raspberrypi_3.18: Remove
In reply to Khem Raj--- .../0001-dts-add-overlay-for-pitft22.patch | 110 --------------------- recipes-kernel/linux/linux-raspberrypi_3.18.bb | 14 --- 2 files changed, 124 deletions(-) delete mode 100644 recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch deleted +0 -110
@@ -1,110 +0,0 @@ -From 2f44861e2a2d651a9aa62a75343a032fee33e93b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petter=20Mab=C3=A4cker?= <[email protected]> -Date: Fri, 8 Jan 2016 09:02:44 +0100 -Subject: [PATCH] dts: add overlay for pitft22 in linux 3.18 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo: -https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic - -Signed-off-by: Petter Mabäcker <[email protected]> ---- - arch/arm/boot/dts/overlays/Makefile | 1 + - arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++++++++++++++++++++++++++ - 2 files changed, 70 insertions(+) - create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts - -diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile -index c766616..1eaaf81 100644 ---- a/arch/arm/boot/dts/overlays/Makefile -+++ b/arch/arm/boot/dts/overlays/Makefile -@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb -+dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb - dtb-$(RPI_DT_OVERLAYS) += rpi-dac-overlay.dtb -diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts -new file mode 100755 -index 0000000..894ba22 ---- /dev/null -+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts -@@ -0,0 +1,69 @@ -+/* -+ * Device Tree overlay for pitft by Adafruit -+ * -+ */ -+ -+/dts-v1/; -+/plugin/; -+ -+/ { -+ compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; -+ -+ fragment@0 { -+ target = <&spi0>; -+ __overlay__ { -+ status = "okay"; -+ -+ spidev@0{ -+ status = "disabled"; -+ }; -+ -+ spidev@1{ -+ status = "disabled"; -+ }; -+ }; -+ }; -+ -+ fragment@1 { -+ target = <&gpio>; -+ __overlay__ { -+ pitft_pins: pitft_pins { -+ brcm,pins = <25>; -+ brcm,function = <1>; /* out */ -+ brcm,pull = <0>; /* none */ -+ }; -+ }; -+ }; -+ -+ fragment@2 { -+ target = <&spi0>; -+ __overlay__ { -+ /* needed to avoid dtc warning */ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ pitft: pitft@0{ -+ compatible = "ilitek,ili9340"; -+ reg = <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pitft_pins>; -+ -+ spi-max-frequency = <32000000>; -+ rotate = <90>; -+ fps = <25>; -+ bgr; -+ buswidth = <8>; -+ dc-gpios = <&gpio 25 0>; -+ debug = <0>; -+ }; -+ -+ }; -+ }; -+ -+ __overrides__ { -+ speed = <&pitft>,"spi-max-frequency:0"; -+ rotate = <&pitft>,"rotate:0"; -+ fps = <&pitft>,"fps:0"; -+ debug = <&pitft>,"debug:0"; -+ }; -+}; --- -1.9.1 -
recipes-kernel/linux/linux-raspberrypi_3.18.bb deleted +0 -14
@@ -1,14 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" - -LINUX_VERSION ?= "3.18.16" - -SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c" -SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \ - file://0001-dts-add-overlay-for-pitft22.patch \ - " -require linux-raspberrypi.inc - -# Create missing out of tree 'overlays' directory prior to install step -do_compile_prepend() { - mkdir -p ${B}/arch/arm/boot/dts/overlays -}
Signature · 1 line
2.9.2
PATCH 20/23 firmware, userland: Bump to latest
In reply to Khem Rajfirmware -> 20160726
userland -> 20160728
--- recipes-bsp/common/firmware.inc | 4 +- ...-applications-to-set-next-resource-handle.patch | 10 ++-- ...ayland-Add-support-for-the-Wayland-winsys.patch | 65 ++++++++++++---------- .../0003-wayland-Add-Wayland-example.patch | 2 +- ...-wayland-egl-Add-bcm_host-to-dependencies.patch | 2 +- ...emove-faulty-assert-to-make-weston-happy-.patch | 2 +- ...6-zero-out-wl-buffers-in-egl_surface_free.patch | 4 +- ...007-initialize-front-back-wayland-buffers.patch | 4 +- .../userland/userland/0008-Remove-RPC_FLUSH.patch | 2 +- .../userland/0009-fix-cmake-dependency-race.patch | 4 +- .../0010-Fix-enum-conversion-warnings.patch | 2 +- ...Fix-for-framerate-with-nested-composition.patch | 2 +- .../0012-build-shared-library-for-vchostif.patch | 4 +- ...nt-buffer-wrapping-interface-for-dispmanx.patch | 2 +- recipes-graphics/userland/userland_git.bb | 2 +- 15 files changed, 59 insertions(+), 52 deletions(-)
recipes-bsp/common/firmware.inc +2 -2
@@ -1,5 +1,5 @@ -RPIFW_SRCREV ?= "390f53ed0fd79df274bdcc81d99e09fa262f03ab" -RPIFW_DATE ?= "20160622" +RPIFW_SRCREV ?= "1205048f037098b1532bb947d1f4b823bcdebdf7" +RPIFW_DATE ?= "20160726" RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" RPIFW_S ?= "${WORKDIR}/git"
recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch +5 -5
@@ -1,4 +1,4 @@ -From 83c5ac5892d0cd29caa8922ff8b639b9a373c3cb Mon Sep 17 00:00:00 2001 +From a096ab4b7bbdd8f78d93a54a8da1ca3c9470c2ec Mon Sep 17 00:00:00 2001 From: Dom Cobley <[email protected]> Date: Tue, 9 Jul 2013 09:26:26 -0400 Subject: [PATCH 01/13] Allow applications to set next resource handle
@@ -16,10 +16,10 @@ It's useful for implementing, say, a buffer carousel. 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/interface/khronos/common/khrn_client_rpc.h b/interface/khronos/common/khrn_client_rpc.h -index 418aa67..a7557a8 100644 +index dc4351d..10ea060 100644 --- a/interface/khronos/common/khrn_client_rpc.h +++ b/interface/khronos/common/khrn_client_rpc.h -@@ -683,6 +683,7 @@ static INLINE void rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id +@@ -685,6 +685,7 @@ static INLINE void rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); } static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); } static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
@@ -27,7 +27,7 @@ index 418aa67..a7557a8 100644 #endif #define RPC_CALL1_OUT_CTRL(fn, thread, id, out) rpc_call1_out_ctrl(thread, id, out) -@@ -700,6 +701,7 @@ static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id +@@ -702,6 +703,7 @@ static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out)
@@ -125,7 +125,7 @@ index 472ef0c..234da65 100644 thread, EGLINTSWAPBUFFERS_ID, diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c -index 0fa1fd1..0dc10e2 100644 +index 6846dfa..128325e 100644 --- a/interface/khronos/egl/egl_client_surface.c +++ b/interface/khronos/egl/egl_client_surface.c @@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create(
recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch +36 -29
146 lines not on this page · raw message
recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch +1 -1
@@ -1,4 +1,4 @@ -From b6ee187184456d66095146e3dc06b6baa29c17d7 Mon Sep 17 00:00:00 2001 +From ce82c93dfede66447ea9d1195202bf0b0b09fa16 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso <[email protected]> Date: Tue, 1 Oct 2013 13:19:20 +0200 Subject: [PATCH 03/13] wayland: Add Wayland example
recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch +1 -1
@@ -1,4 +1,4 @@ -From e3df3fec01aefac3ec301f6f3d5ec3e91652b9c5 Mon Sep 17 00:00:00 2001 +From 809ea78d19ce21c4f74aeab58394d6c2396e166c Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 10 Aug 2015 02:38:27 -0700 Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies
recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch +1 -1
@@ -1,4 +1,4 @@ -From 6c9d407c9ec0859380e7bcf35cf915cef4b3687b Mon Sep 17 00:00:00 2001 +From dc87269edc34616a9adb11147be2d7efef9b25e2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" <[email protected]> Date: Sat, 24 Jan 2015 22:07:19 +0100 Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy
recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch +2 -2
@@ -1,4 +1,4 @@ -From e3ffe9438fe8417586d0045d00eb1368ca3a71b6 Mon Sep 17 00:00:00 2001 +From 9f70762bc0b2d42c45c9206e7b8fb4ce237ba4a3 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 6 Feb 2016 11:10:47 -0800 Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c -index 49cf7e5..512c83b 100644 +index 42350bf..1f923d9 100644 --- a/interface/khronos/egl/egl_client_surface.c +++ b/interface/khronos/egl/egl_client_surface.c @@ -690,11 +690,13 @@ void egl_surface_free(EGL_SURFACE_T *surface)
recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch +2 -2
@@ -1,4 +1,4 @@ -From ed31a6a206c9e205bd5316e95788e5d7bb837e38 Mon Sep 17 00:00:00 2001 +From d0535b7c6108d241ee943eff11c1d62171066d1a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 6 Feb 2016 11:11:41 -0800 Subject: [PATCH 07/13] initialize front back wayland buffers
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 3 insertions(+) diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c -index 512c83b..a429724 100644 +index 1f923d9..9a9582c 100644 --- a/interface/khronos/egl/egl_client_surface.c +++ b/interface/khronos/egl/egl_client_surface.c @@ -401,11 +401,14 @@ EGL_SURFACE_T *egl_surface_create(
recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch +1 -1
@@ -1,4 +1,4 @@ -From 6e173040a825185013ccbbb33113442207f10eeb Mon Sep 17 00:00:00 2001 +From 495f4e8d692be8f61966ce2ed54c50d98690fda2 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 6 Feb 2016 11:09:18 -0800 Subject: [PATCH 08/13] Remove RPC_FLUSH
recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch +2 -2
@@ -1,4 +1,4 @@ -From c4217231fd78daee83b0c0f312c1d392aa6e0f47 Mon Sep 17 00:00:00 2001 +From b83cbbfa7e37c292ce403b44b7e6e2b4c48270a6 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 6 Feb 2016 13:12:47 -0800 Subject: [PATCH 09/13] fix cmake dependency race
@@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644 add_library (vcos SHARED ${SOURCES}) target_link_libraries (vcos pthread dl rt) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index 35150ed..22949a8 100755 +index 6ef97bd..f62a9f5 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -17,14 +17,6 @@ set(VCHOSTIF_SOURCE
recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch +1 -1
@@ -1,4 +1,4 @@ -From 377f6aada3b7569e3d662fc830e01b8c5ba8a15d Mon Sep 17 00:00:00 2001 +From a00eee4a5464f0add14232e1f9d7a8268c02770e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 18 Feb 2016 09:04:46 +0000 Subject: [PATCH 10/13] Fix enum conversion warnings
recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch +1 -1
@@ -1,4 +1,4 @@ -From 6e634184ee4b3d2c98c3213a3931845ec3014754 Mon Sep 17 00:00:00 2001 +From 5e36a54cc219e713796e3b16ccd9da7819cfa836 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Tue, 29 Mar 2016 20:38:30 -0700 Subject: [PATCH 11/13] Fix for framerate with nested composition
recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch +2 -2
@@ -1,4 +1,4 @@ -From 559209ce15027b3370466ccb56223a7a66d2a40c Mon Sep 17 00:00:00 2001 +From 452ea70c80a26e83ac33385c00c5c8352117250e Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 2 Apr 2016 10:37:24 -0700 Subject: [PATCH 12/13] build shared library for vchostif
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index 22949a8..f8c2f2f 100755 +index f62a9f5..85f78fd 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -17,7 +17,7 @@ set(VCHOSTIF_SOURCE
recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch +1 -1
@@ -1,4 +1,4 @@ -From 5b55a152651eece345d9ea1e0e40ecd9fc4ca2d5 Mon Sep 17 00:00:00 2001 +From 4059611f79490606db6d9094263b1c56cd2abc05 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 2 Apr 2016 10:54:59 -0700 Subject: [PATCH 13/13] implement buffer wrapping interface for dispmanx
recipes-graphics/userland/userland_git.bb +1 -1
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "0147f98bdd4fdc822d25d8a70cf5adc5adb89096" +SRCREV = "a63658c5950ce4ac6dc9d125ed977be91896d68c" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
Signature · 1 line
2.9.2
PATCH 21/23 vc4graphics: Support X11 with the VC4 driver.
In reply to Khem RajFrom: Carlos Alberto Lopez Perez <[email protected]>
* We need to use the X11 modesetting driver with VC4.
* We need to build at least the mesa swrast DRI driver. (its already the default so don't overwrite it to empty)
--- conf/machine/include/rpi-base.inc | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
conf/machine/include/rpi-base.inc +1 -1
@@ -12,7 +12,7 @@ XSERVER = " \ xf86-input-evdev \ xf86-input-mouse \ xf86-input-keyboard \ - xf86-video-fbdev \ + ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "xf86-video-modesetting", "xf86-video-fbdev", d)} \ " # Really supported starting from linux-raspberrypi 3.18.y only
recipes-graphics/mesa/mesa_%.bbappend +0 -2
@@ -1,4 +1,2 @@ PACKAGECONFIG_append_rpi = " gallium" GALLIUMDRIVERS_rpi = "vc4" -DRIDRIVERS_rpi = "" -
Signature · 1 line
2.9.2
PATCH 22/23 Switch to using 4.4 as default kernel
In reply to Khem Raj--- conf/machine/include/rpi-default-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/rpi-default-versions.inc +1 -1
@@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%" +PREFERRED_VERSION_linux-raspberrypi ?= "4.4.%"
Signature · 1 line
2.9.2
PATCH 23/23 weston: Fix typo with override
In reply to Khem Raj--- recipes-graphics/weston/weston_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-graphics/weston/weston_%.bbappend +1 -1
@@ -1,4 +1,4 @@ -PACKAGECONFIG_rpi_remove = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' fbdev', '', d)}" +PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' fbdev', '', d)}" EXTRA_OECONF += "--disable-xwayland-test \ --disable-simple-egl-clients \ "
Signature · 1 line
2.9.2