mesa: Update to version 17.0.4

This commit apply bug fixes found in both mesa 17.0.2 and mesa 17.0.3
releases.

  - Mesa 17.0.4 is a bug fix release which fixes the following bugs
    found since the 17.0.3 release:

      Bug 99515  - SIGSEGV MAPERR on Android nougat-x86 with mesa 17.0.0rc
      Bug 100391 - SachaWillems deferredmultisampling asserts
      Bug 100452 - push_constants host memory leak when resetting command buffer
      Bug 100582 - [GEN8+] piglit.spec.arb_stencil_texturing.glblitframebuffer
                   corrupts state.gl_texture* assertions

  - Mesa 17.0.3 is a bug fix release which fixes the following bugs
    found since the 17.0.2 release:

      Bug 96743  - [BYT, HSW, SKL, BXT, KBL] GPU hangs with GfxBench 4.0 CarChase
      Bug 99246  - [d3dadapter+radeonsi & bisect] EVE-Online : hang on wormhole sight
      Bug 100061 - LODQ instruction generated with invalid dst mask
      Bug 100182 - Flickering in The Talos Principle on Sky Lake GT4.
      Bug 100201 - Windows scons build with MSVC toolchain and LLVM 4.0 fails

Change-Id: Id48bd553e8f0d15ed798fcbbdcd0eeaf2337f108
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>

diff --git a/conf/machine/imx6dlsabresd.conf b/conf/machine/imx6dlsabresd.conf
index 27b8391cfd0b2494ce98edb470beb33e59fb1e84..5b6978dd55938bf3d3aa158ec52a9ead69b423b8 100644 (file)
--- a/conf/machine/imx6dlsabresd.conf
+++ b/conf/machine/imx6dlsabresd.conf
@@ -8,12 +8,40 @@ MACHINEOVERRIDES =. "mx6:mx6dl:"
 
 require conf/machine/include/imx6sabresd-common.inc
 
-KERNEL_DEVICETREE = "imx6dl-sabresd.dtb imx6dl-sabresd-ldo.dtb imx6dl-sabresd-hdcp.dtb \
-                     imx6dl-sabresd-enetirq.dtb imx6dl-sabresd-btwifi.dtb"
-
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6dlsabresd_config,sdcard"
 UBOOT_CONFIG[epdc] = "mx6dlsabresd_epdc_config"
 UBOOT_CONFIG[mfgtool] = "mx6dlsabresd_config"
 
+KERNEL_DEVICETREE = " \
+   imx6dl-sabresd.dtb \
+   imx6dl-sabresd-ldo.dtb \
+   imx6dl-sabresd-hdcp.dtb \
+   imx6dl-sabresd-enetirq.dtb \
+   imx6dl-sabresd-btwifi.dtb \
+"
+
+KERNEL_DEVICETREE_remove_use-mainline-bsp = " \
+    imx6dl-sabresd-ldo.dtb \
+    imx6dl-sabresd-hdcp.dtb \
+    imx6dl-sabresd-enetirq.dtb \
+    imx6dl-sabresd-btwifi.dtb \
+"
+
+# IMAGE_BOOT_FILES = " \
+#     zImage \
+#     zImage-imx6dl-sabresd.dtb;imx6dl-sabresd.dtb \
+#     zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb \
+#     zImage-imx6dl-sabresd-hdcp.dtb;imx6dl-sabresd-hdcp.dtb \
+#     zImage-imx6dl-sabresd-enetirq.dtb;imx6dl-sabresd-enetirq.dtb \
+#     zImage-imx6dl-sabresd-btwifi.dtb;imx6dl-sabresd-btwifi.dtb \
+# "
+
+# IMAGE_BOOT_FILES_remove_use-mainline-bsp = " \
+#     zImage-imx6dl-sabresd-ldo.dtb;imx6dl-sabresd-ldo.dtb \
+#     zImage-imx6dl-sabresd-hdcp.dtb;imx6dl-sabresd-hdcp.dtb \
+#     zImage-imx6dl-sabresd-enetirq.dtb;imx6dl-sabresd-enetirq.dtb \
+#     zImage-imx6dl-sabresd-btwifi.dtb;imx6dl-sabresd-btwifi.dtb \
+# "
+
 MACHINE_FIRMWARE += "firmware-imx-epdc"

diff --git a/conf/machine/include/imx6sabresd-common.inc b/conf/machine/include/imx6sabresd-common.inc
index 40e3cde6c2c10c1adfcfed95c255963664039af0..3133731b3a78238071d5e27e10a75a0d4b4a0dc2 100644 (file)
--- a/conf/machine/include/imx6sabresd-common.inc
+++ b/conf/machine/include/imx6sabresd-common.inc
@@ -8,3 +8,14 @@ SERIAL_CONSOLE = "115200 ttymxc0"
 MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += " pci wifi bluetooth"
+
+PREFERRED_PROVIDER_virtual/bootloader_use-mainline-bsp = "u-boot"
+
+IMAGE_DEPENDS_wic_append = " virtual/bootloader"
+
+WKS_FILE ?= "imx-uboot.wks"
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
+    kernel-image \
+    kernel-devicetree \
+"

diff --git a/recipes-backport/mesa/mesa-gl_17.0.1.bb b/recipes-backport/mesa/mesa-gl_17.0.4.bb
similarity index 100%
rename from recipes-backport/mesa/mesa-gl_17.0.1.bb
rename to recipes-backport/mesa/mesa-gl_17.0.4.bb

diff --git a/recipes-backport/mesa/mesa_17.0.1.bb b/recipes-backport/mesa/mesa_17.0.4.bb
similarity index 83%
rename from recipes-backport/mesa/mesa_17.0.1.bb
rename to recipes-backport/mesa/mesa_17.0.4.bb
index 9e491c28dc8e9552aa158b6e935ea42171d12138..d2810bc4c89057fa8060cfe2f7649c1d926f2fac 100644 (file)
--- a/recipes-backport/mesa/mesa_17.0.1.bb
+++ b/recipes-backport/mesa/mesa_17.0.4.bb
@@ -5,8 +5,8 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
            file://disable-asm-on-non-gcc.patch \
            file://0001-Use-wayland-scanner-in-the-path.patch \
 "
-SRC_URI[md5sum] = "6a7e768241846c8c69bbadbf904dcc58"
-SRC_URI[sha256sum] = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c"
+SRC_URI[md5sum] = "4a16cfc1c6d034cc17314b866eada628"
+SRC_URI[sha256sum] = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER