Timo Aaltonen pushed to branch upstream-experimental at X Strike Force / lib / mesa
Commits: 0d6f86f7 by Eric Engestrom at 2024-05-14T14:16:02+02:00 .pick_status.json: Update to 18c53157318d6c8e572062f6bb768dfb621a55fd - - - - - 25aa1788 by José Expósito at 2024-05-14T14:16:02+02:00 meson: Update proc_macro2 meson.build patch Update the proc-macro2/meson.build to include the changes from v1.0.81. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11071 Signed-off-by: José Expósito <jexpo...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28923> (cherry picked from commit 18c53157318d6c8e572062f6bb768dfb621a55fd) - - - - - 8ec4314f by Rob Clark at 2024-05-14T14:16:02+02:00 tu: Fix a6xx lineWidthGranularity Fixes dEQP-VK.info.device_properties. Fixes: 48da361eb7b3 ("tu: wideLines support for a7xx.") Signed-off-by: Rob Clark <robdcl...@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29088> (cherry picked from commit a3e5c156647aa9d72a3d37e0a3227b440ad8adef) - - - - - 4cb80764 by Tapani Pälli at 2024-05-14T14:16:02+02:00 anv: skip gfx push constants alloc optimization on gfx9/11 Always reallocate in cmd_buffer_flush_gfx_push_constants like was done before the the optimization got introduced. Fixes: 62d96a65464 ("anv: add dirty tracking for push constant data") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11064 Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Tested-by: Mark Janes <markja...@swizzler.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28999> (cherry picked from commit c225f89d346e5c94b8b30334b1609d1b3b845e84) - - - - - 53c1539b by Lionel Landwerlin at 2024-05-14T14:16:02+02:00 anv: fix ycbcr plane indexing with indirect descriptors We need to add the plane index to compute the address from which to load the descriptor (anv_sampled_image_descriptor in this case). This was likely broken before we added direct descriptor support so that gets a stable backport. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11125 Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Reviewed-by: Ivan Briano <ivan.bri...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29111> (cherry picked from commit 665cad6408217c35a26f12ae0751441f213aecc6) - - - - - daac0812 by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 egl/x11: disable dri3 with LIBGL_KOPPER_DRI2=1 as expected cc: mesa-stable Acked-by: Daniel Stone <dani...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29106> (cherry picked from commit 568807cf889060fe7c3bd5b9f11ced4d84966790) - - - - - f91463e8 by Karol Herbst at 2024-05-15T15:15:33+02:00 rusticl/icd: remove CLObject I have no idea why I've added it in the first place, but it's causing dead code warnings to appear with newer rustc versions, so remove it. Fixes: 7f77f91929c ("rusticl/icd: split Arc part out of CLObject into new trait") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29120> (cherry picked from commit 146ac5169d2583ee2f800b8d59291648edf799d1) - - - - - de656a6a by Georg Lehmann at 2024-05-15T15:15:33+02:00 zink: use bitcasts instead of pack/unpack double opcodes The pack/unpack double opcodes may flush denorms, and the nir ops are pure bitcasts. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29125> (cherry picked from commit 925fff229fdc963a02348c59ef30ebc3f814d59f) - - - - - 57a53436 by Alexandre Marquet at 2024-05-15T15:15:33+02:00 pan/mdg: quirk to disable auto32 For some reason, flat shading on T604 does not work when using auto32 varyings type. This commit introduces a quirk for T60x, and some plumbing in pan_nir, allowing to explicitely use appropriate types, rather than always using .u32 for flat shading. Backport-to: 24.1 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10632 Signed-off-by: Alexandre Marquet <t...@a-marquet.fr> Reviewed-by: Eric R. Smith <eric.sm...@collabora.com> Acked-by: Erik Faye-Lund <erik.faye-l...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28146> (cherry picked from commit ee9809c889cf5fbb1c60593ebb253878316d6092) - - - - - fe050bd2 by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 zink: add a batch ref for committed sparse resources this ensures that the sparse commit will complete before the resource is destroyed cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29123> (cherry picked from commit 67a356742fd3ff0f03abac07161da6e5c2e1daca) - - - - - d2fbe79d by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 u_blitter: stop leaking saved blitter states on no-op blits drivers expect blitter to clean up after itself cc: mesa-stable Reviewed-by: Marek Olšák <marek.ol...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29122> (cherry picked from commit cd004defd4920243b5b1ad2ca4f8a79e67e5900f) - - - - - ee40beb6 by Rhys Perry at 2024-05-15T15:15:33+02:00 aco/waitcnt: fix DS/VMEM ordered writes when mixed Signed-off-by: Rhys Perry <pendingchao...@gmail.com> Reviewed-by: Georg Lehmann <dadschoo...@gmail.com> Reviewed-by: Daniel Schürmann <dan...@schuermann.dev> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28981> (cherry picked from commit 5b1b09ad429f180dd0b7758487b7e0557c8b094b) - - - - - 8c0d63bc by Lionel Landwerlin at 2024-05-15T15:15:33+02:00 brw: add more condition for reducing sampler simdness Running KHR-GL46.sparse_texture_clamp_tests.SparseTextureClampLookupColor test with Zink on Anv we run into an assert : assert(inst->mlen <= MAX_SAMPLER_MESSAGE_SIZE * reg_unit(devinfo)); Turns out we've not covered all the cases in the SIMD lowering. It's a bit of a shame to have both files reproduce the same logic. Will try to think of a better way to extract the layout of the a send message but that'll be a much bigger rework. Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com> Cc: mesa-stable Reviewed-by: Sagar Ghuge <sagar.gh...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29118> (cherry picked from commit d1c01e256d0df30bee884a49a9d4bfc5b1551ae8) - - - - - 329a7a6b by Eric Engestrom at 2024-05-15T15:15:33+02:00 .pick_status.json: Update to 406dda70e7c9baa59c975eb64025e7c3b210c3bc - - - - - 35590d03 by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 freedreno/replay: use inttypes format string for 64bit cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29142> (cherry picked from commit ae8fbe220ae67ffdce662c26bc4a634d475c0389) - - - - - b397496e by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 frontends/dri: only release pipe when screen init fails the caller (driCreateNewScreen3) will always call dri_destroy_screen() when these functions return failure, so releasing the screen is always wrong cc: mesa-stable Reviewed-by: Adam Jackson <a...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29021> (cherry picked from commit a1225e81c9d0d2b6ada9e6af51be710d2ae2d4dc) - - - - - 1b9927bc by Mike Blumenkrantz at 2024-05-15T15:15:33+02:00 frontends/dri: always init opencl_func_mutex in InitScreen hooks this otherwise leads to a mismatch where some types of screen may have the mutex initialized while others don't, in which case dri_release_screen() will attempt to destroy an uninitialized mutex cc: mesa-stable Reviewed-by: Adam Jackson <a...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29021> (cherry picked from commit bc15c95c7afe56cc0408aa2ba02a5a21f766547b) - - - - - 61ab6dd1 by Faith Ekstrand at 2024-05-15T15:15:33+02:00 nvk: Re-emit sample locations when rasterization samples changes We need them for the case where explicit sample locations are not enabled. While we're at it, fix the case where rasterization_samples=0. This can happen when rasterizer discard is enabled. This fixes MSAA resolves with NVK+Zink. In particular, it fixes MSAA for the Unigine Heaven and Valley benchmark. This also fixes all of the spec@arb_texture_float@multisample-formats piglit tests. Fixes: 41d094c2cc1d ("nvk: Support dynamic state for enabling sample locations") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10786 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29147> (cherry picked from commit a160c2a14e71bb36d420929b0cb408f6346d845d) - - - - - 1b82d45d by Faith Ekstrand at 2024-05-15T15:15:33+02:00 nvk/meta: Restore set_sizes[0] Fixes: af3e7ba1057e ("nvk: Stash descriptor set sizes") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29147> (cherry picked from commit c834644c4e4b39d65003b455e3be5e129767200d) - - - - - 725ad01c by Bas Nieuwenhuizen at 2024-05-15T15:15:33+02:00 radv: Use zerovram for Enshrouded. Two users now reporting that zerovram fixes hangs. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10500 Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29149> (cherry picked from commit 79cb8842753e6dc7c10d6c5af1f1cf7ece5ecc75) - - - - - 42765877 by Tatsuyuki Ishi at 2024-05-15T15:15:33+02:00 radv: Remove radv_queue::device again It was mistakenly revived. Fixes: 0fb19b8331f ("radv: add radv_queue.h") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29151> (cherry picked from commit e21ea25de916b88cc6075b267874fc3085e598a7) - - - - - 7e033ebc by Konstantin Seurer at 2024-05-15T15:15:33+02:00 radv: Fix radv_shader_arena_block list corruption Remove it from the previous list befor adding it to a new one. cc: mesa-stable Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28961> (cherry picked from commit e050abc961d2d063f9d7cf419f43aaf17ba0b039) - - - - - 07000d32 by Konstantin Seurer at 2024-05-15T15:15:33+02:00 radv: Remove arenas from capture_replay_arena_vas Avoids an use after free when looking up an arena. cc: mesa-stable Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28961> (cherry picked from commit df82221bb32c73f111d60e02655339846136e2de) - - - - - ba064029 by Konstantin Seurer at 2024-05-15T15:15:33+02:00 radv: Zero initialize capture replay group handles radv_serialized_shader_arena_block is not tightly packed and using an initializer list leaves the gaps uninitialized. cc: mesa-stable Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28961> (cherry picked from commit 406dda70e7c9baa59c975eb64025e7c3b210c3bc) - - - - - b050d6ab by Eric Engestrom at 2024-05-15T15:15:34+02:00 .pick_status.json: Update to 5502ecd7716045e76f13f007a4aa5f5653c80ecd - - - - - 07e97982 by Eric Engestrom at 2024-05-15T15:15:34+02:00 util/format: add missing null check in util_format_is_srgb() Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11137 Fixes: ff6cf60cb80c3bc31d9a ("gallium/util: add util_format_is_srgb() helper") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29160> (cherry picked from commit 8c22112a7d237a357fc9f373aaa413c8da8ccaab) - - - - - 946a7763 by Eric Engestrom at 2024-05-15T15:15:34+02:00 .pick_status.json: Update to d516721cd0cb16d0b601c42c01de0fdcc4ae887b - - - - - b937e659 by Mike Blumenkrantz at 2024-05-15T15:15:34+02:00 zink: clean up semaphore arrays on batch state destroy cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29152> (cherry picked from commit 604573cf0a81c499667bb107b42c25e21bfa98db) - - - - - bdb59a39 by Antoine Coutant at 2024-05-15T15:15:34+02:00 drisw: fix build without dri3 commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") added dri3_priv.h header and dri3_check_multibuffer() function in drisw that can be build without dri3. Commit 4477139ec2e added a guard around dri3_check_multibuffer() function but not around dri3_priv.h header. Add HAVE_DRI3 guard around dri3_priv.h header. Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") v2: Remove the guard around dri3_check_multibuffer() function. Signed-off-by: Romain Naour <romain.na...@smile.fr> Signed-off-by: Antoine Coutant <antoine.cout...@smile.fr> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478> (cherry picked from commit 3163b65ba73c4c6343e1d3ee69db07721a3713bf) - - - - - d7b87759 by Romain Naour at 2024-05-15T15:15:34+02:00 glxext: don't try zink if not enabled in mesa Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") added an automatic zink fallback even when the zink gallium is not enabled at build time. It leads to unexpected error log while loading drisw driver and zink is not installed on the rootfs: MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") Signed-off-by: Romain Naour <romain.na...@smile.fr> Reviewed-by: Antoine Coutant <antoine.cout...@smile.fr> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478> (cherry picked from commit 02ab51a61eed8fed5940cf88df71f536ce14f0e2) - - - - - 426a6156 by Patrick Lerda at 2024-05-15T15:15:34+02:00 clover: fix memory leak related to optimize Indeed, the object returned by LLVMCreatePassBuilderOptions() was not freed. For instance, this issue is triggered with "piglit/bin/cl-api-build-program": Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0x7f6b15abdf57 in operator new(unsigned long) (/usr/lib64/libasan.so.6+0xb2f57) #1 0x7f6afff6529e in LLVMCreatePassBuilderOptions llvm-18.1.5/lib/Passes/PassBuilderBindings.cpp:83 #2 0x7f6b1186ee41 in optimize ../src/gallium/frontends/clover/llvm/invocation.cpp:521 #3 0x7f6b1186ee41 in clover::llvm::link_program(std::vector<clover::binary, std::allocator<clover::binary> > const&, clover::device const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&) ../src/gallium/frontends/clover/llvm/invocation.cpp:554 #4 0x7f6b1150ce67 in link_program ../src/gallium/frontends/clover/core/compiler.hpp:78 #5 0x7f6b1150ce67 in clover::program::link(clover::ref_vector<clover::device> const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, clover::ref_vector<clover::program> const&) ../src/gallium/frontends/clover/core/program.cpp:78 #6 0x7f6b11401a2b in clBuildProgram ../src/gallium/frontends/clover/api/program.cpp:283 Fixes: 2d4fe5f2297 ("clover/llvm: move to modern pass manager.") Signed-off-by: Patrick Lerda <patrick9...@free.fr> Reviewed-by: Karol Herbst <kher...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29164> (cherry picked from commit df39994d51b4c28201f1b9ca12e572692d8d169c) - - - - - aaa8b362 by Yiwei Zhang at 2024-05-15T15:15:34+02:00 turnip: msm: clean up iova on error path Fixes: e23c4fbd9b6 ("tu: Switch to userspace iova allocations if kernel supports it") Signed-off-by: Yiwei Zhang <zzyi...@chromium.org> Reviewed-by: Danylo Piliaiev <dpilia...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29173> (cherry picked from commit 3909803849ef492e66dd4590fbf3bf51256efb22) - - - - - 66b5cea1 by Yiwei Zhang at 2024-05-15T15:15:34+02:00 turnip: msm: fix racy gem close for re-imported dma-buf For dma-buf, if the import and finish occur back-2-back for the same dma-buf, zombie vma cleanup will unexpectedly close the re-imported dma-buf gem handle. This change fixes it by trying to resurrect from zombie vmas on the dma-buf import path. Fixes: 63904240f21 ("tu: Re-enable bufferDeviceAddressCaptureReplay") Signed-off-by: Yiwei Zhang <zzyi...@chromium.org> Reviewed-by: Danylo Piliaiev <dpilia...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29173> (cherry picked from commit a1392394ba1de0fad8cbcf10bdece3d623c9d7a6) - - - - - 87e5487d by David Heidelberg at 2024-05-15T15:15:34+02:00 freedreno/ci: move the disabled jobs from include to the main file Accidentally moved. Fixes: 9442571664e5 ("ci: separate hiden jobs to -inc.yml files") Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29155> (cherry picked from commit d9a0373a65963dc0507538b77de68808c6652f94) - - - - - 4bf6af79 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk/upload_queue: Only upload one line of data This only doesn't blow up beause we set multi_line_enable = FALSE. Fixes: 2074e28a0d6a ("nvk: Add an upload queue") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29183> (cherry picked from commit 9b098209b9d3b3a9379003d7e53152859967c30e) - - - - - 175c9289 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 vulkan/wsi: Bind memory planes, not YCbCr planes. Reviewed-by: Joshua Ashton <jos...@froggi.es> Fixes: f5433e4d6ce2 ("vulkan/wsi: Add modifiers support to wsi_create_native_image") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10176 Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 28342a581f926777f9923835525fd2f267edfd53) - - - - - 4d53dba4 by Dave Airlie at 2024-05-15T15:15:34+02:00 radv/video/encode: fix quality params on v2 hw. This should have the extra dword as well. Fixes: 54d499818ca9 ("radv/video: add initial support for encoding with h264.") Acked-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29098> (cherry picked from commit 2f02af39b34c013b4829cfde626ab13b69c173b8) - - - - - 1145007a by Marek Olšák at 2024-05-15T15:15:34+02:00 util: shift the mask in BITSET_TEST_RANGE_INSIDE_WORD to be relative to b so that users don't have to shift it at every use. It was supposed to be like this from the beginning. Fixes: fb994f44d91a4b947 - util: make BITSET_TEST_RANGE_INSIDE_WORD take a value to compare with Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29187> (cherry picked from commit 5502ecd7716045e76f13f007a4aa5f5653c80ecd) - - - - - 5f5ebee7 by Friedrich Vock at 2024-05-15T15:15:34+02:00 aco/tests: Insert p_logical_start/end in reduce_temp tests Linear VGPR insertion will depend on a p_logical_end existing in the blocks the VGPR is inserted in. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28041> (cherry picked from commit 84c1870b655d4987da722f03b315d41da57d13ec) - - - - - f8d7ef05 by Friedrich Vock at 2024-05-15T15:15:34+02:00 aco/spill: Insert p_start_linear_vgpr right after p_logical_end If p_start_linear_vgpr allocates a VGPR that is already blocked, RA will try moving the blocking VGPR somewhere else. If p_start_linear_vgpr is inserted right before the branch, that move will be inserted after exec has been overwritten, which might cause the move to be skipped for some threads. Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28041> (cherry picked from commit 590ea76104899edd6883fe50d9590f919b9e97d5) - - - - - ce203e13 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Improve the GetMemoryFdKHR error Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit d63f015d0baf688cfed007fe6dd6eea70ea7657a) - - - - - dac5e319 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nouveau/winsys: Take a reference to BOs found in the cache Fixes: c370260a8f15 ("nouveau/winsys: Add dma-buf import support") Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 19b143b7bc3865fed8c8b09156b85d8c41c32d6b) - - - - - f49045e2 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nouveau/winsys: Make BO_LOCAL and BO_GART separate flags It's sometimes useful to specify both to allow migration. Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 6cd58de4eb79dcced41ca77faae1449368f9ac5e) - - - - - 1adce876 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Allow GART for dma-bufs We also allow dma-bufs to be imported into arbitrary heaps because we relly don't know where they'll come from. Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 71d1fa129a2e854bafbc4fc1064733e65e8f82f7) - - - - - bed6fba7 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nil: Use the right PTE kind for Z32 pre-Turing This got lost in the Rust rewrite. Fixes: 426553d61d16 ("nil: Re-implement nil_image in Rust") Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 73c87dbc0c447ed8f1b3e4f1fbd19608e3a4baaa) - - - - - 395cd831 by Mohamed Ahmed at 2024-05-15T15:15:34+02:00 nil: Add a nil_image::compressed bit Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 873a044cb3d6c99e6fc749fa7c5d2afc5e904f4b) - - - - - b7f177ce by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Set color/Z compression based on nil_image::compressed Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 603389f7a3508a94bb44718bbb9b21c468c65bf7) - - - - - 797b25e4 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nil: Default to NV_MMU_PTE_KIND_GENERIC_MEMORY on Turing+ Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit b7773f96f9e86a087855345a030c9cd585efe702) - - - - - 73f3805d by Mohamed Ahmed at 2024-05-15T15:15:34+02:00 nil: Add some helpers for DRM format modifiers Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit e1bd4127f36cf509d1a418402a641e361ec48b0f) - - - - - 11ff1834 by Mohamed Ahmed at 2024-05-15T15:15:34+02:00 nil: Support creating images with DRM modifiers Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 6063f96c61dc80990ed3ad67eb0acb5a3796676a) - - - - - 8307d829 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Allow VK_IMAGE_ASPECT_MEMORY_PLANE_0_BIT Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 8cce121da44adb8141b98b9a8352f1deda7fddcc) - - - - - 727e86c0 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 drm-uapi: Sync nouveau_drm.h Taken from drm-misc-next-fixes: commit 959314c438caf1b62d787f02d54a193efda38880 Author: Mohamed Ahmed <mohamedahmedegypt2...@gmail.com> Date: Thu May 9 23:43:52 2024 +0300 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 03c4a46fe5511d09b5b99a0a370e8f308a892549) - - - - - f887e1fd by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nouveau/winsys: Add back nouveau_ws_bo_new_tiled() This reverts commit ce1cccea98d6257f2015b32b92d826e4ebc0a7f9. In this new version, we also add a query for whether or not tiled BOs are supported by nouveau.ko. Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 3bb531d24599d8daa10c1cee631ea8ed3e9fa432) - - - - - 96fdc7fa by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Support image creation with modifiers Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit f1fdffa1b2e5c1b9b813191a2881030cc7278906) - - - - - 623c7df2 by Faith Ekstrand at 2024-05-15T15:15:34+02:00 nvk: Set tile mode and PTE kind on dedicated dma-buf BOs This is our compromise to make NVK and nouveau GL play nice when it comes to modifiers. The old GL driver depends heavily on the PTE kind and tile mode, even for images with modifiers. While it correctly encodes the PTE kind and tile mode in the modifiers it advertises, it may ignore the modifier and just trust what's set on the BO when it imports a dma-buf image. This is partly because it doesn't support VM_BIND and partly because of preexisting bugs in the modifiers implementation. In either case, we can't fix it retroactively. To work around this, NVK also sets the PTE kind and tile mode on the BO when it's a dedicated allocation created for a DRM format modifiers image. If DRM format modifiers are used without dedicated allocations, things may still break but that's getting into vanishingly unlikely scenarios. Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 4ad79bfef427b0b40acca403587b2e249389f533) - - - - - bbdfab5c by Faith Ekstrand at 2024-05-15T15:15:35+02:00 nvk: Implement DRM format modifier queries Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 224d9a514a83a3236ad42c1b74458cde69dc6647) - - - - - b182fe0a by Mohamed Ahmed at 2024-05-15T15:15:35+02:00 nvk: enable rendering to DRM_FORMAT_MOD_LINEAR images Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit bca2f13dd8ee3904fac67bbe273226a0864caa59) - - - - - 1f2b11a5 by Faith Ekstrand at 2024-05-15T15:15:35+02:00 nvk: Advertise VK_EXT_queue_family_foreign Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit d8e200c0d954892c9ecf152c4c465a915700d743) - - - - - dc1dd72d by Faith Ekstrand at 2024-05-15T15:15:35+02:00 nvk: Advertise VK_EXT_image_drm_format_modifier Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9636 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9480 Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit cd428e01d7876da243933ee49f10f866777820f5) - - - - - 9e27390d by Faith Ekstrand at 2024-05-15T15:15:35+02:00 nvk/wsi: Advertise modifier support Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit e6f77defec0d61f9f5851bdbda5bf4cc97cd1cea) - - - - - 90ad5fc6 by Faith Ekstrand at 2024-05-15T15:15:35+02:00 zink: Set workarounds.can_do_invalid_linear_modifier for NVK This fixes most of the egl_image_dma_buf* piglit tests. The remaining fails are YCbCr tests which are likely unrelated to core dma-buf import/export. Reviewed-by: Dave Airlie <airl...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795> (cherry picked from commit 8bc694223ed9a0bd354139a3b174f13004442591) - - - - - e46605c1 by David Heidelberg at 2024-05-15T15:15:35+02:00 ci/deqp: correct EGL_EXT_config_select_group detection It's now a display extension, not an client one. Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29145> (cherry picked from commit 9f42a34625bdd0f246afd47a5fa126788a40321e) - - - - - 981703aa by Robert Mader at 2024-05-15T15:15:35+02:00 egl: Implement EGL_EXT_config_select_group It allows us to influence the order of EGL configs for arbitrary reasons, which will be used in the following commit. Based on a patch by Freya Gentz <zegen...@protonmail.com>, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2376 Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Reviewed-by: Adam Jackson <a...@redhat.com> Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Signed-off-by: Robert Mader <robert.ma...@posteo.de> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9989> (cherry picked from commit 0d90415625c12f534aae7767ca801b310dc3f376) - - - - - f2d36e3d by David Heidelberg at 2024-05-15T15:15:35+02:00 egl/x11: Move RGBA visuals in the second config selection group This ensures that alpha-blended windows are at the bottom of the visuals list, so they don't get picked up accidentally. Based on: "egl-X11: Put RGBA visuals in the second config selection group" Suggested-by: Freya Gentz <zegen...@protonmail.com> # original concept Co-authored-by: Robert Mader <robert.ma...@posteo.de> Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9989> (cherry picked from commit 3736c9997c6efb3ef6b63923bbddada3d003e632) - - - - - 680ed160 by Robert Mader at 2024-05-15T15:15:35+02:00 egl: Implement EGL_MESA_x11_native_visual_id EGL 1.5 specification requires to not match on EGL_NATIVE_VISUAL_ID. EGL_MESA_x11_native_visual_id extension allows us to remove this restriction for X11, where we need to match EGL_NATIVE_VISUAL_ID to find visuals which allow blending. The reasoning is that on X11, compositors use the visual as "magic bit" to decide whether to alpha-blend surface contents. Unlike on most (all?) other windowing systems, requesting an alpha channel for the config alone does not already imply blending on the compositor level. Thus, in order to allow clients to explicitly request configs with "magic bit" and, similar to GLX, to order configs in a way so clients not requesting alpha-blending do not get it by accident, do match visual ids. Note that one consequence of this is that more configs get reported to clients. Based on a patch by Freya Gentz <zegen...@protonmail.com>, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2376 Signed-off-by: Robert Mader <robert.ma...@posteo.de> Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9989> (cherry picked from commit 9bdab38424543061ea9e76bc420e07b8ddd8be03) - - - - - 2351b027 by Robert Mader at 2024-05-15T15:15:35+02:00 egl/x11: Allow all RGB visuals to match 32-bit RGBA EGLConfigs Drop the limitation to 24 or 30 bit configs. It was an abritrary compromise to usually give apps what they wanted, but now we are about to get a clean solution for alpha-blending on X11. Based on a patch by Freya Gentz <zegen...@protonmail.com>, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2376 Signed-off-by: Robert Mader <robert.ma...@posteo.de> Signed-off-by: David Heidelberg <david.heidelb...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9989> (cherry picked from commit 8a02ca1b2eb9dc100a5c7a6089e515485e50fecc) - - - - - d999eda0 by Eric Engestrom at 2024-05-15T15:15:35+02:00 .pick_status.json: Update to aa9244c8f6bfa3fb33cf233104b00fc44fc9459f - - - - - 7f095e14 by Eric Engestrom at 2024-05-15T15:18:23+02:00 .pick_status.json: Mark a45f1990860db3a8da6d7251bb627a314dfb8423 as denominated - - - - - cbb030e8 by Karol Herbst at 2024-05-15T15:18:24+02:00 event: break long dependency chains on drop This prevents stack overflows on drop without making it expensive to read from dependencies (e.g. my attempt to use Weak instead). Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29190> (cherry picked from commit 48c752d3e060fc62dcc5ed228c2464efc6591029) - - - - - 3e455f9d by David Rosca at 2024-05-15T15:18:24+02:00 frontends/va: Only increment slice offset after first slice parameters Fixes slice offset if app submits exactly one data buffer followed by parameter buffers. Fixes: 6746d4df6ea ("frontends/va: Fix AV1 slice_data_offset with multiple slice data buffers") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11133 Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11138 Tested-by: Marcus Seyfarth <m.seyfa...@gmail.com> Reviewed-by: Boyuan Zhang <boyuan.zh...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29124> (cherry picked from commit b33bb4077d7500232a5cadd956b5c8810bb5c9ba) - - - - - 8013c8fe by Yiwei Zhang at 2024-05-15T15:18:24+02:00 turnip: virtio: fix error path in virtio_bo_init Fixes: f17c5297d7a ("tu: Add virtgpu support") Signed-off-by: Yiwei Zhang <zzyi...@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29093> (cherry picked from commit 585a87ae53a181ab2a0e73fca0e4d84f75523823) - - - - - bf9cd275 by Yiwei Zhang at 2024-05-15T15:18:24+02:00 turnip: virtio: fix iova leak upon found already imported dmabuf There's a success path on found dmabuf while the iova won't be cleaned up. This change defers iova alloc till lookup miss and also to prepare for later racy dmabuf re-import fix. Also documented a potential leak on error path due to unable to tell whether a gem handle should be closed or not without refcounting. Fixes: f17c5297d7a ("tu: Add virtgpu support") Signed-off-by: Yiwei Zhang <zzyi...@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29093> (cherry picked from commit 6ca192f586fe1470a97b6f34bce7761a760ce15d) - - - - - 23ba879b by Yiwei Zhang at 2024-05-15T15:18:24+02:00 turnip: virtio: fix racy gem close for re-imported dma-buf Similar to the prior fix for msm. On the dmabuf import path, tu_bo_init can be outside of the vma lock, but left inside for code simplicity. Fixes: f17c5297d7a ("tu: Add virtgpu support") Signed-off-by: Yiwei Zhang <zzyi...@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29093> (cherry picked from commit 43bb9890708c0bc51159338395984e93fbf6af35) - - - - - 6f912e98 by Paulo Zanoni at 2024-05-15T15:18:24+02:00 isl: add ISL_TILING_64_XE2 to isl_tiling_to_name() Fixes: c69650a95e26 ("isl,blorp,anv: introduce ISL_TILING_64_XE2 for Xe2+ platforms") Reviewed-by: Rohan Garg <rohan.g...@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27306> (cherry picked from commit 66b6671d3c104e5725f550d26b5872534760946c) - - - - - b36299c5 by Guilherme Gallo at 2024-05-15T15:37:05+02:00 ci: Add S3 id_token for all jobs id_tokens will replace $CI_JOB_TOKEN predefined variable in GitLab 18.0 See: https://docs.gitlab.com/ee/update/deprecations.html#default-cicd-job-token-ci_job_token-scope-changed Signed-off-by: Guilherme Gallo <guilherme.ga...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28916> (cherry picked from commit 2639c9105267cc8228c5bf2f08f8203207014b37) - - - - - 86e3e447 by Guilherme Gallo at 2024-05-15T15:37:05+02:00 ci: Use id_tokens for JWT auth Fixes: #9180 Signed-off-by: Guilherme Gallo <guilherme.ga...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28916> (cherry picked from commit 7101aecc53f49402b725a8081f7005c15839cb43) - - - - - 30a8e6b2 by Sergi Blanch Torne at 2024-05-15T15:37:05+02:00 ci: kernel stored in a different s3 bucket Due to the expiration time in `mesa-lava` (1m), the kernel used in mesa is now using `mesa-rootfs` (1y). Due to this change, a fresh kernel image has been prepared and mesa has also a few changes to adapt to this redirection. cc: mesa-stable Signed-off-by: Sergi Blanch Torne <sergi.blanch.to...@collabora.com> Co-developed-by: Guilherme Gallo <guilherme.ga...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28979> (cherry picked from commit cc6bd04dd7bad9ec694e1f9623d63a061ed72757) - - - - - d9857b27 by Sergi Blanch Torne at 2024-05-15T15:37:05+02:00 ci: identify and label S3 buckets As for the S3 bucket where the kernel image is stored has been identified and labeled, the other buckets in use can also be identified and labeled. cc: mesa-stable Signed-off-by: Sergi Blanch Torne <sergi.blanch.to...@collabora.com> Co-developed-by: Guilherme Gallo <guilherme.ga...@collabora.com Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28979> (cherry picked from commit 72b3c2e4baa124d84a798873a36f497cf3a9243f) - - - - - d0602e2d by Eric Engestrom at 2024-05-15T18:49:23+02:00 VERSION: bump for 24.1.0-rc4 - - - - - 16 changed files: - .gitlab-ci.yml - .gitlab-ci/bare-metal/rootfs-setup.sh - .gitlab-ci/common/generate-env.sh - .gitlab-ci/common/init-stage2.sh - .gitlab-ci/container/build-deqp.sh - .gitlab-ci/container/gitlab-ci.yml - .gitlab-ci/container/lava_build.sh - + .gitlab-ci/container/patches/build-deqp-egl_Correct-EGL_EXT_config_select_group-extension-query.patch - .gitlab-ci/download-git-cache.sh - .gitlab-ci/image-tags.yml - .gitlab-ci/lava/lava-gitlab-ci.yml - .gitlab-ci/lava/lava-submit.sh - .gitlab-ci/lava/utils/lava_job_definition.py - .gitlab-ci/piglit/piglit-traces.sh - .gitlab-ci/prepare-artifacts.sh - .gitlab-ci/test/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/71f25dc28cabee2b8b96c57bbccd7016ebebbe2f...d0602e2dabc2fcfa65a352f3eb3f90965a1783d4 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/-/compare/71f25dc28cabee2b8b96c57bbccd7016ebebbe2f...d0602e2dabc2fcfa65a352f3eb3f90965a1783d4 You're receiving this email because of your account on salsa.debian.org.