meta-raspberrypi: subtree update:05c86e3160..6f85d3f665

Bartłomiej Burdukiewicz (1):
      linux-raspberrypi_5.4.bb: Update to latest

Drew Moseley (1):
      raspberrypi3: Switch to vc4-fkms-v3d.

Fabio Berton (1):
      rpi-u-boot-scr: Set u-boot-default-script as provider

Khem Raj (20):
      rpio: Use python3 during build
      gstreamer1.0-plugins-base: Adjust for meson conversion
      mesa: Fix patch fuzz
      linux-raspberrypi: Fix building selftest/bpf
      oeqa: Add rpi specific kernel dmesg parser
      linux-raspberrypi: Get PMU fixes on top of 4.19.108
      qtbase: Append userland to rdeps iff vc4graphics is not enabled
      qtbase: Drop xkb packageconfig
      userland: Update to 20200316 snapshot
      userland: Fix build with gcc10
      rpi-base: Drop old dtbo names
      linux-raspberrypi: Add recipes for kernel 5.4
      linux-raspberrypi_5.4.bb: Update to latest and fix build with binutils 2.34
      linux-raspberrypi_5.4.bb: Enable powersave options in kconfig
      linux-raspberrypi_5.4.bb: Backport the patch to use CHECK macro instead of RET_IF
      linux-raspberrypi_5.4.bb: Update to latest
      linux-firmware-rpidistro: Upgrade to 20190114-1+rpt6
      psplash: Do not define ALTERNATIVE_PRIORITY for non-existing provider
      linux-raspberrypi_5.4.bb: Update to latest
      linux-raspberrypi_5.4.bb: Update to 5.4.35

Leon Anavi (3):
      docs/extra-build-config.md: Auto-load I2C modules
      rpi-base.inc: Add kernel modules to all images
      rpi-base.inc: Include modules if I2C is enaled

Madhavan Krishnan (1):
      gstreamer: Fix the compilation issue in meta multimedia image

Martin Jansa (7):
      userland: add pkg-config for openmaxil and add virtual/libomxil to PROVIDES
      gstreamer1.0-plugins-base: adapt to gstreamer1.0 now using meson
      gstreamer1.0-omx: let virtual/libomxil dependency to pull userland
      omxplayer: respect virtual/libomxil
      packagegroup-rpi-test: include bigbuckbunny in RRECOMMENDS_${PN} only with meta-multimedia
      packagegroup-rpi-test: use MACHINE_ARCH
      linux-raspberrypi: fix perf build with latest binutils

Orne Brocaar (1):
      rpi-base.conf: add disable-bt.dtbo and miniuart-bt.dtbo overlays.

Pierre-Jean Texier (17):
      kas-poky-rpi: add kas file
      rpi-base.inc: use wic.bz2 for all rpi machines by default
      linux-raspberrypi: bump to Linux version 4.19.97
      raspberrypi-firmware: bump to version 20200205
      linux-raspberrypi: bump to Linux version 4.19.102
      linux-raspberrypi: bump to Linux version 4.19.105
      raspberrypi-firmware: update to current HEAD
      linux-raspberrypi: bump to Linux version 4.19.108
      raspberrypi-firmware: update to current HEAD
      layer.conf: add dunfell to compat layer
      raspberrypi-firmware: update to current HEAD
      linux-raspberrypi: bump to Linux version 4.19.113
      README.md: add status badge for raspberrypi4
      raspberrypi-firmware: update to current HEAD
      linux-raspberrypi: bump to Linux version 4.19.115
      raspberrypi-firmware: update to current HEAD
      linux-raspberrypi: bump to Linux version 4.19.120

rkhan467 (1):
      mesa: querying dma_buf modifiers for specific formats

Change-Id: I956a7aedff5028fa3af56b101ecaad17b3ff64e0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch b/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch
new file mode 100644
index 0000000..0bda014
--- /dev/null
+++ b/meta-raspberrypi/recipes-graphics/mesa/files/0001-dri2-query-dma-buf-modifiers.patch
@@ -0,0 +1,43 @@
+mesa: querying dma_buf_modifiers for specific formats
+
+mesa wl_drm protocol is the backend for wayland server side which requires
+the dmabuf modifiers for some DRM formats on specific devices like RPI. 
+Currently there is no support of giving any dmabuf modifiers on wl_drm protocol.
+This dma_buf modifiers allows EGL implementations to add extra attributes
+to drm_fourcc format.
+
+Upstream-Status: Pending 
+
+Signed-off-by: Balaji Velmurugan <balaji.velmurugan@ltts.com>
+
+--- a/src/gallium/state_trackers/dri/dri2.c
++++ b/src/gallium/state_trackers/dri/dri2.c
+@@ -1366,14 +1366,28 @@ dri2_from_planar(__DRIimage *image, int
+    return img;
+ }
+ 
++static boolean
++dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max,
++                             uint64_t *modifiers, unsigned int *external_only,
++                             int *count);
+ static __DRIimage *
+ dri2_from_fds(__DRIscreen *screen, int width, int height, int fourcc,
+               int *fds, int num_fds, int *strides, int *offsets,
+               void *loaderPrivate)
+ {
++   uint64_t modifier= DRM_FORMAT_MOD_INVALID;
++   unsigned int external_only= 0;
++   int count= 0;
++   boolean result;
++   result= dri2_query_dma_buf_modifiers( screen, fourcc, 1, &modifier, &external_only, &count);
++   return dri2_create_image_from_fd(screen, width, height, fourcc,
++                                   modifier, fds, num_fds,
++                                   strides, offsets, NULL, loaderPrivate);
++   #if 0
+    return dri2_create_image_from_fd(screen, width, height, fourcc,
+                                    DRM_FORMAT_MOD_INVALID, fds, num_fds,
+                                    strides, offsets, NULL, loaderPrivate);
++   #endif
+ }
+ 
+ static boolean
diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
index eaa46f2..d3435e7 100644
--- a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
+++ b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,6 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 # DRI3 note:
 # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set
 # as default. To state out clearly that Raspi needs dri3 and to avoid surprises
 # in case oe-core changes this default, we set dri3 explicitly.
+
+SRC_URI_append_rpi = " file://0001-dri2-query-dma-buf-modifiers.patch "
+
 PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}"
 DRIDRIVERS_class-target_rpi = ""