diff --git a/Mesa.changes b/Mesa.changes index e9c2068..8741012 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Sep 13 15:42:12 UTC 2024 - Stefan Dirsch + +- U_egl-x11-sw-fix-partial-image-uploads.patch + * culprit for the regression in 24.1.4; reverse apply this for + now (boo#1228164) + +------------------------------------------------------------------- +Thu Sep 5 19:20:59 UTC 2024 - Bjørn Lie + +- Update to bugfix release 24.1.7 + --> https://docs.mesa3d.org/relnotes/24.1.7 +- Supersedes the following patch: + * U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch +- Rebase patches with quilt. + ------------------------------------------------------------------- Sun Aug 25 09:04:57 UTC 2024 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index df32186..0192f09 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 24.1.3 +%define _version 24.1.7 %define with_opencl 0 %define with_rusticl 0 %define with_vulkan 0 @@ -145,7 +145,7 @@ %global _paste_crate_ver 1.0.14 Name: Mesa%{psuffix} -Version: 24.1.3 +Version: 24.1.7 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -183,8 +183,8 @@ Patch15: u_fix_rust_bindgen.patch Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch -Patch101: U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch Patch400: n_stop-iris-flicker.patch +Patch500: U_egl-x11-sw-fix-partial-image-uploads.patch %ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers %endif @@ -839,8 +839,8 @@ cp %{SOURCE6} subprojects/packagecache/ %endif %patch -P 58 -p1 %patch -P 100 -p1 -%patch -P 101 -p1 %patch -P 400 -p1 +%patch -P 500 -p1 -R # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... diff --git a/U_egl-x11-sw-fix-partial-image-uploads.patch b/U_egl-x11-sw-fix-partial-image-uploads.patch new file mode 100644 index 0000000..86ee546 --- /dev/null +++ b/U_egl-x11-sw-fix-partial-image-uploads.patch @@ -0,0 +1,52 @@ +From 5903c215ab5b4c5d3bb1c952c0c784b78a0412fc Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Tue, 13 Feb 2024 13:10:30 -0500 +Subject: [PATCH] egl/x11/sw: fix partial image uploads + +* swrast allocates images aligned to 64x64 tiles, which results in images + that are larger than the window. PutImage requests must be clamped on + the y-axis to avoid uploading/damaging out-of-bounds regions +* winsys coords are y-inverted + +cc: mesa-stable + +Reviewed-by: Adam Jackson +Part-of: +(cherry picked from commit 6088a0bf51dd6bdfe39d9160a748bdde016f2c96) +--- + .pick_status.json | 2 +- + src/egl/drivers/dri2/platform_x11.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/.pick_status.json b/.pick_status.json +index cc044e5e788..802f9799d23 100644 +--- a/.pick_status.json ++++ b/.pick_status.json +@@ -164,7 +164,7 @@ + "description": "egl/x11/sw: fix partial image uploads", + "nominated": true, + "nomination_type": 0, +- "resolution": 0, ++ "resolution": 1, + "main_sha": null, + "because_sha": null, + "notes": null +diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c +index 97436a0254b..e0d9ddb343e 100644 +--- a/src/egl/drivers/dri2/platform_x11.c ++++ b/src/egl/drivers/dri2/platform_x11.c +@@ -174,6 +174,11 @@ swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h, + return; + } + ++ /* clamp to drawable size */ ++ if (y + h > dri2_surf->base.Height) ++ h = dri2_surf->base.Height - y; ++ /* y-invert */ ++ y = dri2_surf->base.Height - y - h; + if (size < max_req_len) { + cookie = xcb_put_image( + dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable, gc, w, +-- +2.43.0 + diff --git a/U_fix-mpeg1_2-decode-mesa-20.2.patch b/U_fix-mpeg1_2-decode-mesa-20.2.patch index fd9eaf9..2ad8e13 100644 --- a/U_fix-mpeg1_2-decode-mesa-20.2.patch +++ b/U_fix-mpeg1_2-decode-mesa-20.2.patch @@ -3,11 +3,11 @@ src/gallium/drivers/r600/evergreen_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: mesa-23.3.0/src/gallium/drivers/r600/evergreen_state.c +Index: mesa-24.1.7/src/gallium/drivers/r600/evergreen_state.c =================================================================== ---- mesa-23.3.0.orig/src/gallium/drivers/r600/evergreen_state.c -+++ mesa-23.3.0/src/gallium/drivers/r600/evergreen_state.c -@@ -598,7 +598,8 @@ static void *evergreen_create_sampler_st +--- mesa-24.1.7.orig/src/gallium/drivers/r600/evergreen_state.c ++++ mesa-24.1.7/src/gallium/drivers/r600/evergreen_state.c +@@ -584,7 +584,8 @@ static void *evergreen_create_sampler_st : state->max_anisotropy; unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso); bool trunc_coord = state->min_img_filter == PIPE_TEX_FILTER_NEAREST && diff --git a/U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch b/U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch deleted file mode 100644 index f6a7fdc..0000000 --- a/U_radeonsi-vcn-Add-decode-DPB-buffers-as-CS-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8b35da91b23afc65256b78a59d116fd09544cd28 Mon Sep 17 00:00:00 2001 -From: David Rosca -Date: Mon, 5 Aug 2024 09:14:37 +0200 -Subject: [PATCH] radeonsi/vcn: Add decode DPB buffers as CS dependency - -This is needed to ensure correct synchronization in kernel eg. when it -moves the buffers between VRAM and GTT. - -Reviewed-by: Boyuan Zhang -(cherry picked from commit 0c024bbe641b092bbbc751baae54a37642794de0) - -Part-of: ---- - src/gallium/drivers/radeonsi/radeon_vcn_dec.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c -index ede5f9d7c1a5..9e3d0b88493b 100644 ---- a/src/gallium/drivers/radeonsi/radeon_vcn_dec.c -+++ b/src/gallium/drivers/radeonsi/radeon_vcn_dec.c -@@ -1838,6 +1838,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn - RVID_ERR("Ref list from application is incorrect, using dummy buffer instead.\n"); - addr = dec->ws->buffer_get_virtual_address(dummy->dpb.res->buf); - } -+ dec->ws->cs_add_buffer(&dec->cs, d->dpb.res->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, RADEON_DOMAIN_VRAM); - dynamic_dpb_t2->dpbAddrLo[i] = addr; - dynamic_dpb_t2->dpbAddrHi[i] = addr >> 32; - ++dynamic_dpb_t2->dpbArraySize; --- -2.43.0 - diff --git a/mesa-24.1.3.tar.xz b/mesa-24.1.3.tar.xz deleted file mode 100644 index 3557659..0000000 --- a/mesa-24.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d -size 29086488 diff --git a/mesa-24.1.3.tar.xz.sig b/mesa-24.1.3.tar.xz.sig deleted file mode 100644 index 81809a7..0000000 Binary files a/mesa-24.1.3.tar.xz.sig and /dev/null differ diff --git a/mesa-24.1.7.tar.xz b/mesa-24.1.7.tar.xz new file mode 100644 index 0000000..699d7c9 --- /dev/null +++ b/mesa-24.1.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecd2e7b1c73998f4103542f39c6b8c968d251637ccc8caa42641aecb86cd2566 +size 29206724 diff --git a/mesa-24.1.7.tar.xz.sig b/mesa-24.1.7.tar.xz.sig new file mode 100644 index 0000000..844f578 Binary files /dev/null and b/mesa-24.1.7.tar.xz.sig differ diff --git a/n_add-Mesa-headers-again.patch b/n_add-Mesa-headers-again.patch index bde0bbb..27dba92 100644 --- a/n_add-Mesa-headers-again.patch +++ b/n_add-Mesa-headers-again.patch @@ -1,8 +1,8 @@ -Index: mesa-24.0.3/include/meson.build +Index: mesa-24.1.7/include/meson.build =================================================================== ---- mesa-24.0.3.orig/include/meson.build -+++ mesa-24.0.3/include/meson.build -@@ -28,7 +28,6 @@ if with_android_stub +--- mesa-24.1.7.orig/include/meson.build ++++ mesa-24.1.7/include/meson.build +@@ -29,7 +29,6 @@ if with_android_stub inc_include += [include_directories('android_stub')] endif @@ -10,7 +10,7 @@ Index: mesa-24.0.3/include/meson.build if with_gles1 or with_gles2 or with_opengl or with_egl install_headers('KHR/khrplatform.h', subdir : 'KHR') endif -@@ -84,7 +83,6 @@ if not with_glvnd and host_machine.syste +@@ -85,7 +84,6 @@ if not with_glvnd and host_machine.syste subdir : 'EGL', ) endif diff --git a/u_dep_xcb.patch b/u_dep_xcb.patch index 5eee22e..2a63c3f 100644 --- a/u_dep_xcb.patch +++ b/u_dep_xcb.patch @@ -1,8 +1,8 @@ -Index: mesa-24.0.3/meson.build +Index: mesa-24.1.7/meson.build =================================================================== ---- mesa-24.0.3.orig/meson.build -+++ mesa-24.0.3/meson.build -@@ -2069,9 +2069,11 @@ if with_platform_x11 +--- mesa-24.1.7.orig/meson.build ++++ mesa-24.1.7/meson.build +@@ -2114,9 +2114,11 @@ if with_platform_x11 endif endif if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')