Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / mesa
Commits: 3b5adf60 by Eric Engestrom at 2024-06-19T18:28:40+02:00 docs: add sha256sum for 24.1.2 - - - - - 83e71754 by Eric Engestrom at 2024-06-19T18:57:11+02:00 ci/shader-db: drop extra nesting section `.gitlab-ci/run-shader-db.sh` already prints sections, having an extra one here just means that nothing is visible by default. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29113> (cherry picked from commit dc7e80ce85578c3596f860da5a46f2e140c6d806) - - - - - d7d1146b by Eric Engestrom at 2024-06-19T18:57:11+02:00 ci/debian-build-testing: drop extra nesting section `.gitlab-ci/meson/build.sh` already prints sections, having an extra one here just means that nothing is visible by default. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29113> (cherry picked from commit d428cc1116fd5cec4b397bfaca87e59570f178da) - - - - - 78a1fdbb by Eric Engestrom at 2024-06-19T20:05:45+02:00 ci: fix section_end in debian-build-testing Fixes: d428cc1116fd5cec4b39 ("ci/debian-build-testing: drop extra nesting section") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29170> (cherry picked from commit 34844deb3ed50c3cdda1cc00239e291f5e4773ef) - - - - - 2afbeefc by Faith Ekstrand at 2024-06-19T20:05:45+02:00 nir/format_convert: Smash NaN to 0 in pack_r9g9b9e5() I have no idea why I flipped the order of these to checks vs. the C code when I wrote the NIR helper. We need to deal with NaN first or else the fmin will smash NaN to MAX_RGB9E5 and it won't get handled as NaN. Fixes: 9981709d8f3c ("nir/format_convert: Add a function to pack RGB9_E5 formats") Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Reviewed-by: Boris Brezillon <boris.brezil...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28793> (cherry picked from commit 86aad90e2a89293385000f28f9f03a2675591870) [Eric] swap `color` and `clamped`, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28793#note_2459681 - - - - - fda0731c by Eric Engestrom at 2024-06-21T17:11:49+02:00 .pick_status.json: Update to 1ff86021a7a06d2548482c40b1584042e298f58e - - - - - 20cbc1ee by José Roberto de Souza at 2024-06-21T17:45:13+02:00 anv: Remove block promoting non CPU mapped bos to coherent The intention of this block was to set one of the flags that is used to select a PAT index but this was doing more than that. It was promoting WB+0 way coherency BOs to WC+1 way coherency possibly causing regression in platforms without LLC. anv_device_get_pat_entry() return WC/writecombining if no flags is set so we don't need this block after all. Reported-by: Sushma Venkatesh Reddy <sushma.venkatesh.re...@intel.com> Fixes: a65e982b4412 ("anv: Split ANV_BO_ALLOC_HOST_CACHED_COHERENT into two actual flags") Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Signed-off-by: José Roberto de Souza <jose.so...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29769> (cherry picked from commit 9d8d5cf8c9a04b164d1becff6b1be93b24149c75) - - - - - edb1d3ea by Mary Guillemard at 2024-06-21T17:45:14+02:00 panvk: Report correct min value for discreteQueuePriorities Signed-off-by: Mary Guillemard <mary.guillem...@collabora.com> Fixes: ac34183ec3d ("panvk: Move the VkPhysicalDevice logic to panvk_physical_device.{c,h}") Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29800> (cherry picked from commit 3129d71fef6eb717b990faf7fefefc9fbc6f9954) - - - - - cba9b1d0 by Konstantin Seurer at 2024-06-21T17:45:15+02:00 llvmpipe: Lock shader access to sample_functions sample_functions can be re-allocated. Fixes: 7ebf7f4 ("llvmpipe: Compile sample functioins on demand") Reviewed-by: Roland Scheidegger <roland.scheideg...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29699> (cherry picked from commit 9e4a44d172335906d147cf0bc6ec7ac70e6c239f) - - - - - 320f0197 by Konstantin Seurer at 2024-06-21T17:45:15+02:00 llvmpipe: Stop using a sample_functions pointer as cache key sample_functions can be reallocated between get_sample_function and llvmpipe_clear_sample_functions_cache. Fixes: 7ebf7f4 ("llvmpipe: Compile sample functioins on demand") Reviewed-by: Roland Scheidegger <roland.scheideg...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29699> (cherry picked from commit 5941bee0176f9498b36c2975a3968c0d68c63986) - - - - - 790aa9a2 by Konstantin Seurer at 2024-06-21T17:45:16+02:00 llvmpipe: Only evict cache entries if a fence is available Makes sure that no chaders are running when accessing sample_functions. Fixes: 7ebf7f4 ("llvmpipe: Compile sample functioins on demand") Reviewed-by: Roland Scheidegger <roland.scheideg...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29699> (cherry picked from commit 255f4bb2903dc96d24507a3eaae31bb77cb0ee6c) - - - - - de8982ba by Konstantin Seurer at 2024-06-21T17:45:17+02:00 lavapipe: Always call finish_fence after lvp_execute_cmd_buffer Makes sure that sample_functions is not modified while shaders are running. Fixes: 7ebf7f4 ("llvmpipe: Compile sample functioins on demand") Reviewed-by: Roland Scheidegger <roland.scheideg...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29699> (cherry picked from commit ce85f3a431897f19c366f7daccffd994ac2f1a77) - - - - - bf86fa1b by Rhys Perry at 2024-06-21T17:45:17+02:00 aco/insert_exec_mask: ensure top mask is not a temporary at loop exits This is problematic when the successor of the loop exit is an invert block. It assumes that the top mask is Operand(bld.lm) and doesn't change it when entering the else branch. Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11348 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29767> (cherry picked from commit 71afacff3976743265546365034df46ab04d6e92) - - - - - 53d1306f by Pierre-Eric Pelloux-Prayer at 2024-06-21T17:46:02+02:00 ac/llvm: implement WA in nir to llvm LLVM implements multiple workarounds for gfx11. The problem is that they're not applied for shaders built in parts. LLVM will be modified to be more conservative and apply the workaround in more places but in the meantime, add a simpler implementation in the NIR to LLVM backend: insert a wait at the end of each shader part. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10785 Cc: mesa-stable Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29304> (cherry picked from commit 14974fd097f57814eac18648cfc07dd02c350d57) - - - - - c2a8d04b by Erik Faye-Lund at 2024-06-21T17:47:20+02:00 nir: fix utf-8 encoding-issue This UTF-8 encoding issue seems to cause issues with the doxygen docs-integration. Fixes: 21115514857 ("Convert a few files to UTF-8") Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29801> (cherry picked from commit a1c220fd935b8731f4bab1891aae0480006630eb) - - - - - f2b2e389 by Mike Blumenkrantz at 2024-06-21T17:50:04+02:00 dri: rename 'implicit' param from earlier series I accidentally merged the wrong version of this, and this was supposed to be the correct and more informative name Acked-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29066> (cherry picked from commit 2efa1ae0d538b446cd61c837564ecdc724953f0c) - - - - - 180ca581 by Mike Blumenkrantz at 2024-06-21T17:50:06+02:00 zink: null check pipe loader config before use Fixes: e3ea55fef28 ("zink: don't print error messages when failing an implicit driver load") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11220 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29806> (cherry picked from commit 453ceceec2e176dbb537dec9a073f51a561ae75c) - - - - - aa87b788 by Erik Faye-Lund at 2024-06-21T17:50:14+02:00 Revert "docs: use html_static_path for static files" No, html_static_path doesn't do the same thing as html_extra_path; it puts things inside the _static folder, which we don't want here. Let's revert the change. This reverts commit e037761a2f6845653520e0785844efe1fd9340b4. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29805> (cherry picked from commit 47e422adfae761c0066379ec34a93baa5b11d96d) - - - - - 32e0363c by Lionel Landwerlin at 2024-06-21T17:50:15+02:00 anv: fix vkCmdWaitEvents2 handling Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Rohan Garg <rohan.g...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29716> (cherry picked from commit 00982e1af618f43a4c7a5ab8aeb6ded43e68a802) - - - - - 2613580c by Jesse Natalie at 2024-06-21T17:53:43+02:00 wgl: Delete pixelformat support query This whole thing was just a mess and never really worked the way it was supposed to. All drivers can support GDI interop and double-buffering independently at this point, so just remove it. Fixes: c432fbe5 ("wgl: Add no-gdi-single-buffered and gdi-double-buffered PFDs") Reviewed-By: Mike Blumenkrantz <michael.blumenkra...@gmail.com> Reviewed-by: Jose Fonseca <jose.fons...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29819> (cherry picked from commit a02b759f413a589a77d36c9ffe731cb139e2ed1d) - - - - - 4d5347a5 by Jesse Natalie at 2024-06-21T17:53:44+02:00 wgl: Fix flag check for GDI compat Fixes: c432fbe5 ("wgl: Add no-gdi-single-buffered and gdi-double-buffered PFDs") Reviewed-By: Mike Blumenkrantz <michael.blumenkra...@gmail.com> Reviewed-by: Jose Fonseca <jose.fons...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29819> (cherry picked from commit df49d9da10281d2c86c6f04ec41333b454bb6ee1) - - - - - 7cdf6f9d by Dylan Baker at 2024-06-21T17:53:55+02:00 clc: remove check for null pointer that cannot be true in llvm_mod_to_spirv Snce the *args parameter was added it's assumed to be non-null. If it is null then the function is going off to UB land. As such, a later check added for args being NULL is useless, and confuses coverity. fixes: 3a752256f54ce839f6e75d508df51eba6464ef77 Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29664> (cherry picked from commit e67a8dc59af44abb4b0349c66cfd5770985ff3ce) - - - - - 9dcd13d5 by José Roberto de Souza at 2024-06-21T17:53:56+02:00 anv: Fix assert in xe_gem_create() In this assert we want to enforce that if a cached buffer is created it is a cached+coherent as Xe KMD don't support cached+incoherent. Did not caught this issue because it only reproduces in platforms with GPU outside of LLC. Fixes: 9d8d5cf8c9a0 ("anv: Remove block promoting non CPU mapped bos to coherent") Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Signed-off-by: José Roberto de Souza <jose.so...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29826> (cherry picked from commit 73ce3143a810d79e9bf0df8926ae58e9aad13bf1) - - - - - 6e61244d by Paulo Zanoni at 2024-06-21T17:53:57+02:00 anv/xe: fix declaration of memory flags for integrated non-LLC platforms Makes Cyberpunk, Hitman and Total War Warhammer 3 run on LNL. Fixes: c9e41f25a1bd ("anv: Add heaps for Xe KMD in platforms without LLC") Reviewed-by: José Roberto de Souza <jose.so...@intel.com> Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29775> (cherry picked from commit 87787c4a877dc4968724e4b2279eef1647b12ec9) - - - - - ce2f8fa7 by Karol Herbst at 2024-06-21T17:53:58+02:00 util/u_printf: properly handle %% Cc: mesa-stable Reviewed-by: Jesse Natalie <jenat...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29776> (cherry picked from commit d51a14aab8724d0b5b6e11fb92747f04042d63e1) - - - - - 6489f1c1 by Karol Herbst at 2024-06-21T17:55:32+02:00 rusticl/memory: assume minimum image_height of 1 But still report 0 for the slice_pitch when queried. Fixes clCopyImage 1Dbuffer Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29776> (cherry picked from commit 45fc5c032e14cef50ac851e1eae7b2c2ec297541) - - - - - a063c050 by Karol Herbst at 2024-06-21T17:55:33+02:00 rusticl/memory: fix clFillImage for buffer images Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29776> (cherry picked from commit 4df8567394422d9754d35864702f0fffa0ab3c64) - - - - - 865c926a by Karol Herbst at 2024-06-21T17:55:35+02:00 rusticl: add new CL_INVALID_BUFFER_SIZE condition for clCreateBuffer Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29776> (cherry picked from commit 1ff86021a7a06d2548482c40b1584042e298f58e) - - - - - 40a435a1 by Eric Engestrom at 2024-06-26T12:36:55+02:00 .pick_status.json: Update to c4a38c658317bc8d17447fd6ee3e717a96ca9948 - - - - - dc0192e7 by Julian Orth at 2024-06-26T12:37:04+02:00 egl/wayland: ignore unsupported driver configs Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29904> (cherry picked from commit 77759f7683b673a3b0bff040a8d39f3c433e9ed2) - - - - - 8a6c8086 by Rhys Perry at 2024-06-26T12:48:40+02:00 vtn: ensure TCS control barriers have a large enough memory scope A workgroup or larger scope is necessary for writes to be visible to other invocations. Fixes incorrect snow rendering in Indika. Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11299 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29735> (cherry picked from commit 21f8410191378165219b3dbd6374064fc18a625c) - - - - - 10d38dd7 by Karol Herbst at 2024-06-26T12:48:41+02:00 rusticl: add bsymbolic to linker flags This will prevent the dynamic loader to pick the wrong function once we rename things to the proper API names. In any case, this should have been done all along anyway. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29855> (cherry picked from commit be090abf2ec2b2c86fa33cbd11ae8ef90205c311) - - - - - 46ae863f by Bas Nieuwenhuizen at 2024-06-26T12:48:42+02:00 util/disk_cache: Fix cache marker refresh. Refresh if older than a day, not less than a day old. Fixes: 3f119a1fd8d ("util/disk_cache: Add marker on cache usage") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29728> (cherry picked from commit 9b775d26c49e22dad5da1021ff0b63103669bcae) - - - - - ba17678e by Tapani Pälli at 2024-06-26T12:48:43+02:00 isl: fix condition for enabling sampler route to lsc This will disable cases with 2D array views (which could be views to 3D texture) but enables on regular 2D surfaces which seems to work fine. Fixes: 70382f7f065 ("intel/isl/xe2: Enable route of Sampler LD message to LSC") Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: José Roberto de Souza <jose.so...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29760> (cherry picked from commit 4a0a716b6a8c072f9ae16555db17ea8a3d73534c) - - - - - 10fd6a55 by Paulo Zanoni at 2024-06-26T12:48:45+02:00 anv/sparse: fix TR-TT page table bo size and flags Since commit 18d8c3ca339d we were allocating a little more than what we were actually using (2621440 bytes instead of 2097152, aka 0x280000 instead of 0x200000), and we were not properly marking the BO as internal. No applications should be misbehaving because of this. Fixes: 18d8c3ca339d ("anv: Add missing ANV_BO_ALLOC_INTERNAL") Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29337> (cherry picked from commit 2f65acfbb888db537c7b32c9101198b8b46f3d1e) - - - - - 708e358f by Karol Herbst at 2024-06-26T12:48:46+02:00 rusticl/queue: gracefully stop the worker thread Ohterwise we might get caught up in memory corruptions I still have no explanation for. Fixes spontanous crashes with radeonsi and the OpenCL CTS. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29880> (cherry picked from commit 9d458b7fc15a87720397b5b3d94a0971ed4aa59d) - - - - - 827b6028 by Erik Faye-Lund at 2024-06-26T12:48:48+02:00 docs: use os.pardir I'm not really sure if this ever matters in real-life, but os.pardir exists and we should probably use it instead of hard-coding it to '..'. Fixes: 67485efd654 ("docs: prepare for hawkmoth") Reviewed-by: Daniel Stone <dani...@collabora.com> Reviewed-by: Eric Engestrom <e...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11494> (cherry picked from commit 09c1f3b9fd9ef9696aef20035fc344e257d264d9) - - - - - 00449b86 by Michel Dänzer at 2024-06-26T12:48:49+02:00 egl/dri: Use packed pipe_format This is consistent with __DRI_IMAGE_FORMAT_ARGB8888 and the rest of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27709 . This makes no difference with little endian, it does with big endian though. Fixes: dcbf61f5dfe3 ("egl/dri: Use pipe_format instead of DRI_IMAGE_FORMAT") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29781> (cherry picked from commit 2dec0cbe01c158f79cfb89b216ac230da7e87533) - - - - - 11d6ddf5 by Qiang Yu at 2024-06-26T22:06:36+02:00 nir: fix lower array to vec metadata preserve indirect store lowering will change control flow, so we should not preserve control flow metadate when it's present. Fixes: 35b8f6f40bb4 ("nir: Add a new pass to lower array dereferences on vectors") Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Signed-off-by: Qiang Yu <yuq...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29894> (cherry picked from commit 09b4ba27a3200aa6ff7dfba9a8e8d1da849affe6) - - - - - 7c9f3965 by Qiang Yu at 2024-06-26T22:06:36+02:00 nir: fix clip cull distance lowering metadata preserve indirect store lowering will use if/else which changes the control flow of the shader. Fixes: 110887de2bd9 ("nir: Add a new pass to lower array dereferences on vectors") Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Signed-off-by: Qiang Yu <yuq...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29894> (cherry picked from commit 93f790b04a4a02cfee746a5e11c8b208b8d851e5) - - - - - 63f161ff by Rhys Perry at 2024-06-26T22:06:36+02:00 aco: skip continue_or_break LCSSA phis when not needed Fixes: //exec is empty here loop { %1:s[16-17] = ... if () { break } %2:s[16-17] = ... continue_or_break } %3 = phi %1, undef //because of the undef, %2 can use s[16-17] and overwrite the address load(%3:s[16-17]) No fossil-db changes. Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Fixes: bbe46524307e ("aco: create lcssa phis for continue_or_break loops when necessary") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11333 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29838> (cherry picked from commit e3ffc244f51860f9c5530136a8816c4f36aa0eaa) - - - - - bf8ad2d8 by Daniel Schürmann at 2024-06-26T22:06:36+02:00 aco/spill: Unconditionally add 2 SGPRs to live-in demand Due to undefined Operands, it might not be enough to check the predecessors' register demand. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29804> (cherry picked from commit 4c2f231cc0c6a7c62cfc2dc852bdcdc71d49b051) - - - - - 85393322 by Eric Engestrom at 2024-06-26T22:08:41+02:00 .pick_status.json: Update to dd85b50d182a2bd1c67d9a8f858d93fc4dded91c - - - - - a142c1cf by Erik Faye-Lund at 2024-06-26T22:08:44+02:00 docs: fix bootstrap-extension We shouldn't use this extension at all if we're not using the HTML builder. This should hopefully fix this issue a bit more fundamentally. This caused issues when using the spelling extension, something I do locally from time to time. Fixes: f72033bb707 ("docs: add bootstrap extension") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29888> (cherry picked from commit f4e7204e7381f29b4eaa2a79f7fd92e7ceb7fe42) - - - - - a7e26d7c by Pierre-Eric Pelloux-Prayer at 2024-06-26T22:08:45+02:00 ac/surface: reject modifiers with retile_dcc and bpe != 32 radv has a comment in radv_meta_dcc_retile.c: * BPE is always 4 at the moment and the rest is derived from the tilemode. radeonsi has in si_retile_dcc: /* We have only 1 variant per bpp for now, so expect 32 bpp. */ assert(tex->surface.bpe == 4); This fixes ext_image_dma_buf_import-modifiers for radeonsi. Cc: mesa-stable Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29612> (cherry picked from commit abd048124a2abdf94e57297445c8bd0a93829b5a) - - - - - 7da58350 by Connor Abbott at 2024-06-26T22:08:46+02:00 ir3: Make sure constlen includes stc/ldc.k/ldg.k instructions nir_opt_preamble sometimes adds useless expressions, in which case we may have stc instructions and no corresponding use of the constant. Things can go sideways when these aren't included in the constlen, so far only observed when earlypreamble is enabled. Fixes: ccc64b7e00b ("ir3: Plumb through store_uniform_ir3 intrinsic") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29903> (cherry picked from commit c42f6597f9f1f27e632b47f77b360f5fb6a39e40) - - - - - bc755325 by Karol Herbst at 2024-06-26T22:08:55+02:00 nir/schedule: add write dep also for shared_atomic Otherwise it might change the order between a load_shared and a shared_atomic on the same location. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29918> (cherry picked from commit 3482ea599bed7618a4865e5fa0c073efa54ef08d) - - - - - bd826b5c by Samuel Pitoiset at 2024-06-27T13:20:48+02:00 radv/amdgpu: fix chaining CS with external IBs on compute queue In a scenario where two non-concurrent cmdbufs are submitted to the compute queue and with the second one using DGCC, the driver would have chained the CS of the first cmdbuf to the new IB created right after the DGC IB is executed. Found while working on DGC task shader with vkd3d-proton. Cc: mesa-stable Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29913> (cherry picked from commit fec9b56f1733efd7849cfb82ca0c5a7c6d68e242) - - - - - e1ff3ff3 by Eric Engestrom at 2024-06-27T13:21:08+02:00 .pick_status.json: Update to 037eaa962b56ff70ecf889ace05020635964e23c - - - - - 1bf3d6c8 by Iago Toral Quiroga at 2024-06-27T13:21:11+02:00 broadcom/compiler: don't spill in between multop and umul24 The multop instruction implicitly writes rtop which is not preserved acrosss thread switches. We can spill the sources of the multop (since these would happen before multop) and the destination of umul24 (since that would happen after umul24). Fixes some OpenCL tests when V3D_DEBUG=opt_compile_time is used to choose a different compile configuration. cc: mesa-stable Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29909> (cherry picked from commit 38b7f411a1fb26ef4b2714852c7f950f0a3a710c) - - - - - f58569a7 by Iago Toral Quiroga at 2024-06-27T13:21:12+02:00 broadcom/compiler: fix per-quad spilling This is not safe when we have conditional spills since we could be spilling disabled lanes with undefined values that could overwrite valid data for those lanes from a previous spill of the same temp that was unconditional (or that condionally enabled those same lanes). Fixes some Piglit OpenCL tests as well as the following OpenCL tests: integer_divideAssign integer_moduloAssign integer_mad_sat integer_ops integer_divideAssign integer_ops integer_mad_sat integer_ops integer_moduloAssign integer_ops quick_char_math integer_ops quick_short_math math_brute_force half_powr math_brute_force pow math_brute_force pown math_brute_force powr math_brute_force rootn Fixes: 597560e27c ('broadcom/compiler: always enable per-quad on spill operations') Reviewed-by: Alejandro Piñeiro <apinhe...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29909> (cherry picked from commit d1f8351f3c1c0b9306ed6a7ead500a72d69811d3) - - - - - 4e8e1b6b by Eric Engestrom at 2024-07-01T01:37:19+02:00 .pick_status.json: Update to 68215332a8cd87d8109ee4c3b50e04df223d9c83 - - - - - cb8eb332 by Patrick Lerda at 2024-07-01T01:37:25+02:00 clover: fix meson opencl-spirv option As reported by https://gitlab.freedesktop.org/mesa/mesa/-/issues/10674 this option is broken. Indeed, when "with_clc" is false the compilation process failed with the following error: "ERROR: Unknown variable "idep_mesaclc". Fixes: 815a6647eb1 ("meson: do not pull in clc for clover") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10674 Signed-off-by: Patrick Lerda <patrick9...@free.fr> Reviewed-by: Jesse Natalie <jenat...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29646> (cherry picked from commit 82e9880b04f3734dc75d38a4560fb04dd48ed1ed) - - - - - fdf3106d by Samuel Pitoiset at 2024-07-02T17:57:14+02:00 radv: fix incorrect cache flushes before decompressing DCC on compute Found by luck. Cc: mesa-stable Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29940> (cherry picked from commit bc52e77397670c7aceb0bc5dae87b70be6bd7e67) [Eric: add back WRITE_BIT, to set both] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29940#note_2476173 - - - - - a405ba5a by José Expósito at 2024-07-02T18:01:49+02:00 llvmpipe: Init eglQueryDmaBufModifiersEXT num_modifiers Initialize the number of modifiers when `max` is 0 as documented [1]: If <max_formats> is 0, no formats are returned, but the total number of formats is returned in <num_formats>, and no error is generated. [1] https://registry.khronos.org/EGL/extensions/EXT/EGL_EXT_image_dma_buf_import_modifiers.txt Fixes: d74ea2c117fe ("llvmpipe: Implement dmabuf handling") Reported-by: Michal Odehnal <modeh...@redhat.com> Tested-by: Michal Odehnal <modeh...@redhat.com> Reviewed-by: Lucas Fryzek <lfry...@igalia.com> Signed-off-by: José Expósito <jexpo...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29941> (cherry picked from commit 1ef3b38ff84e60f35251813493e212ff31bb019d) - - - - - 3d565a58 by Neha Bhende at 2024-07-02T18:01:49+02:00 svga: Retrieve stride info from hwtnl->cmd.vdecl for swtnl draws This fixes spec@!opengl 1.0@gl-1.0-polygon-line-aa spec@!opengl 1.1@clipflat and multiple piglit tests failures on VGPU9 device Fixes: 76725452 ("gallium: move vertex stride to CSO") Reviewed-by: Brian Paul <brian.p...@broadcom.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29947> (cherry picked from commit 8b8f347e4b90afe3d341c7e884e04b7c19573b17) - - - - - 298b19e7 by Alyssa Rosenzweig at 2024-07-02T18:01:49+02:00 nir: fix miscompiles with rules with INT32_MIN 812b3415 added rules for upcasts with comparisons with a variety of types. The float & unsigned rules should be ok, but the signed integer rules are unsound as currently implemented. This can cause end-to-end miscompiles. I originally hit this issue while debugging a large real world OpenCL kernel. I found the bug symptoms changed when disabling loop unrolling, which tipped me off to a compiler bug. I've reduced it to a minimal test case. Imagine my surprise when I find out the NIR my backend ingested was already constant folded to be wrong. In the minimal test case, during optimization we have NIR: 32 %6 = .... 64 %9 = i2i64 %6 64 %44 = load_const (0x0000000000000001) 1 %45 = ilt %9, %44 (0x1) This is a simple check (int64_t)%6 < 1. nir_opt_algebraic turns this into: 32 %6 = ... 64 %9 = i2i64 %6 64 %44 = load_const (0x0000000000000001) 64 %55 = load_const (0x0000000080000000 = 2147483648) 1 %56 = ilt %55 (0x80000000), %44 (0x1) 64 %57 = load_const (0x000000007fffffff = 2147483647) 1 %58 = ilt %57 (0x7fffffff), %44 (0x1) 32 %59 = i2i32 %44 (0x1) 1 %60 = ilt %6, %59 1 %61 = ior %58, %60 1 %62 = iand %56, %61 This pile of math constant-folds to an unconditional "false"! The problem is %56. At first glance, INT32_MIN < 1 is true so %56 should be true. Indeed, it should. But here's the kicker: both constants are 64-bit here, so the ilt operation is a 64-bit comparison -- that left-hand side is INT32_MIN zero-extended to 64-bit for the signed comparison at 64-bit. So in fact, it evaluates to false, causing the whole expression to go false. If we're going to do a 64-bit comparison for %56, then we need to sign-extend the bound. So we'll just adjust the Python and be on our way, right? Unfortunately the issue is deeper. According to the comment in the generated nir_opt_algebraic.c file, the guilty algebraic rule is: ('ilt', ('i2i64', 'a@32'), '#b') => ('iand', ('ilt', -2147483648, 'b'), ('ior', ('ilt', 2147483647, 'b'), ('ilt', 'a', ('i2i32', 'b')))) >From a Python perspective? That rule is correct. -2147483648 < 1 is a true statement. Adjusting the Python rule is not the appropriate solution here, since the issue is more fundamental and might affect other rules. The real problem is the translation of that Python replacement tree into C, incorrectly zero-extending -2147483648 into 0x0000000080000000 instead of sign-extending to 0xffffffff80000000. Crawling down the rabbit hole of the generated algebraic file, we see the constant encoded as: { .constant = { { nir_search_value_constant, 64 }, nir_type_int, { -0x80000000 /* -2147483648 */ }, } }, NIR correctly translates the negative constant to a C level negate operation of its absolute value. This maps to the correct sign-extension... ...for all constants except for INT_MIN. Because that constant lacks a ULL suffix, it is a 32-bit integer. And for this integer (only), negating it hits signed integer overflow (UB!) and then we end up with an effective zero-extension when going to 64-bit. This patch fixes the end-to-end miscompile. Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Closes: #11402 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29952> (cherry picked from commit 270446ee2145186ba4af6c0934ad58e4dbf91448) - - - - - 276355a0 by Eric Engestrom at 2024-07-02T18:01:49+02:00 .pick_status.json: Update to 6b5a12611bff70ffb3c736de29ff5631efbb8770 - - - - - 51386907 by Lionel Landwerlin at 2024-07-02T18:01:49+02:00 anv: add a protected scratch pool Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Ivan Briano <ivan.bri...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29778> (cherry picked from commit 08a4e0a2e3c9f5c174ec81910b0bb117dabf497a) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29985> - - - - - 7b216f9c by Lionel Landwerlin at 2024-07-02T18:01:49+02:00 anv: prepare 2 variants of all shader instructions One variant uses a protected scratch surface the other not. Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Ivan Briano <ivan.bri...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29778> (cherry picked from commit 3ccf80f9b15a49bbd79702d3c4de7ee65c8837b1) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29985> - - - - - 5b1e09ed by Lionel Landwerlin at 2024-07-02T18:01:49+02:00 anv: allocate compute scratch using the right scratch pool Cc: mesa-stable Reviewed-by: Ivan Briano <ivan.bri...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29778> (cherry picked from commit 57e74d7b56f81edd8cba6c575aec340291a3ef9b) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29985> - - - - - 0207a145 by Lionel Landwerlin at 2024-07-02T18:01:49+02:00 anv: emit the right shader instruction for protected mode Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Ivan Briano <ivan.bri...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29778> (cherry picked from commit b8f8926026f71ccfa7d2d6adce56c7976a9fe9a0) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29985> - - - - - 0ee495cd by Luc Ma at 2024-07-02T18:01:49+02:00 meson: Build pipe-loader when build-tests is true Gallium/tests/trivial requires dynamic pipe loader at runtime, that is, $prefix/$libdir/gallium-pipe/pipe_*.so must get built and installed. so let's build it if build-tests is enabled. v2: - Fix error of meson when both of clover and tests are enabled (dbaker) Signed-off-by: Luc Ma <l...@sietium.com> Acked-by: Marek Olšák <marek.ol...@amd.com> Acked-by: Dylan Baker <dy...@pnwbakers.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27180> (cherry picked from commit 6b5a12611bff70ffb3c736de29ff5631efbb8770) - - - - - cc5f7708 by Eric Engestrom at 2024-07-02T18:01:49+02:00 .pick_status.json: Update to 076cbf605e84ad2f7353099af95969702aac5b77 - - - - - 1cc9cb3c by Lionel Landwerlin at 2024-07-02T18:01:49+02:00 anv: workaround flaky xfb query results on Gfx11 Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29836> (cherry picked from commit 884397b587d2bffe0de9513cf6307300c9db0493) - - - - - 2d6c65b8 by Eric Engestrom at 2024-07-02T18:01:49+02:00 .pick_status.json: Mark 41698eee96b17ab11773ca92bf557d35bc72e207 as denominated - - - - - a57fb7e1 by Eric Engestrom at 2024-07-02T18:01:49+02:00 .pick_status.json: Mark 7033623acd8b7bae8bc52911d4d1c3223726a8f9 as denominated - - - - - 0f423474 by Michel Dänzer at 2024-07-02T18:01:49+02:00 dri: Go back to hard-coded list of RGBA formats Catching these programmatically without false positives / negatives is surprisingly tricky, go back to the known-working list for now. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11398 Fixes: ad0edea53a73 ("st/dri: Check format properties from format helpers") Fixes: 5ca85d75c05d ("dri: Fix BGR format exclusion") v2: * Also put back lima fails removed by 9eeaa4618f8a ("egl/gbm: Enable RGBA configs"), as those tests are now failing again. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29979> (cherry picked from commit cbd19e09d1e293b6b34a30312aac3c865f42b244) - - - - - 7ea0c538 by Dylan Baker at 2024-07-02T18:01:49+02:00 anv/grl: add some validation that we're not going to overflow Coverity has spotted a place where we could in theory overflow. In reality it wont happen as the potential overflow is a bitfield with a maximum of two values. Add an `assume()` statement to help out the compiler and document our assumption. fixes: dc1aedef2bd054884685ad971a3ef5be07ecd101 Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29825> (cherry picked from commit dc604f340a78e093946c3d89a884440c0cb6abba) - - - - - 9671623c by Eric Engestrom at 2024-07-02T18:01:49+02:00 .pick_status.json: Mark 5ca85d75c05de9df7c3170122dfdb04bc795b43a as denominated - - - - - 1ad0543d by Eric Engestrom at 2024-07-03T16:50:58+02:00 docs: add release notes for 24.1.3 - - - - - 0c49f54c by Eric Engestrom at 2024-07-03T16:51:12+02:00 VERSION: bump for 24.1.3 - - - - - 1 changed file: - .gitlab-ci/build/gitlab-ci.yml The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/414057c05c3dff39674ad45855858af02e995c2b...0c49f54c76c13ff2f716e1da6a4ccfb6708028a6 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/414057c05c3dff39674ad45855858af02e995c2b...0c49f54c76c13ff2f716e1da6a4ccfb6708028a6 You're receiving this email because of your account on salsa.debian.org.
