From 58aa7f820e0f4af47ad731ef63f851b844a021374d403daff5a5a02b1db8f4af Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 9 Jan 2017 11:08:04 +0000 Subject: [PATCH] Accepting request 448929 from home:mimi_vx:branches:X11:XOrg - update to 13.0.3 + dropped U_cso-don-t-release-sampler-states-that-are-bound.patch * fdo#77662 Fail to render to different faces of depth-stencil cube map * fdo#92234 [BDW] GPU hang in Shogun2 * fdo#98329 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer * fdo#99038 dEQP-EGL.functional.negative_api.create_pixmap_surface crashes * many radeonsi and i965 bugfixes OBS-URL: https://build.opensuse.org/request/show/448929 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=561 --- Mesa.changes | 11 +++++ Mesa.spec | 9 ++-- ...elease-sampler-states-that-are-bound.patch | 39 ------------------ mesa-13.0.2.tar.xz | 3 -- mesa-13.0.2.tar.xz.sig | Bin 543 -> 0 bytes mesa-13.0.3.tar.xz | 3 ++ mesa-13.0.3.tar.xz.sig | Bin 0 -> 565 bytes 7 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 U_cso-don-t-release-sampler-states-that-are-bound.patch delete mode 100644 mesa-13.0.2.tar.xz delete mode 100644 mesa-13.0.2.tar.xz.sig create mode 100644 mesa-13.0.3.tar.xz create mode 100644 mesa-13.0.3.tar.xz.sig diff --git a/Mesa.changes b/Mesa.changes index bdf01f3..3474351 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jan 5 19:11:14 UTC 2017 - mimi.vx@gmail.com + +- update to 13.0.3 ++ dropped U_cso-don-t-release-sampler-states-that-are-bound.patch +* fdo#77662 Fail to render to different faces of depth-stencil cube map +* fdo#92234 [BDW] GPU hang in Shogun2 +* fdo#98329 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer +* fdo#99038 dEQP-EGL.functional.negative_api.create_pixmap_surface crashes +* many radeonsi and i965 bugfixes + ------------------------------------------------------------------- Thu Dec 15 07:39:30 UTC 2016 - dmueller@suse.com diff --git a/Mesa.spec b/Mesa.spec index c01ddf0..6f49794 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1,7 +1,7 @@ # # spec file for package Mesa # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 13.0.2 +%define _version 13.0.3 %define with_opencl 0 %define with_vulkan 0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x @@ -49,7 +49,7 @@ %endif Name: Mesa -Version: 13.0.2 +Version: 13.0.3 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -74,8 +74,6 @@ Patch15: u_mesa-8.0-llvmpipe-shmget.patch Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch # never to be upstreamed Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch -# Already upstream -Patch22: U_cso-don-t-release-sampler-states-that-are-bound.patch # Nouveau multithreading workarounds from https://github.com/imirkin/mesa/commits/locking Patch61: N_01-WIP-nouveau-add-locking.patch @@ -605,7 +603,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch13 -p1 %patch18 -p1 %patch21 -p1 -%patch22 -p1 %if %{use_broken_nouveau_locking_patches} %patch61 -p1 diff --git a/U_cso-don-t-release-sampler-states-that-are-bound.patch b/U_cso-don-t-release-sampler-states-that-are-bound.patch deleted file mode 100644 index 63e17ef..0000000 --- a/U_cso-don-t-release-sampler-states-that-are-bound.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Marek Olšák -Date: Fri Dec 2 15:39:25 2016 +0100 -Subject: [PATCH]cso: don't release sampler states that are bound -Patch-mainline: 6dc96de303290e8d1fc294da478c4f370be98dea -Git-repo: git://anongit.freedesktop.org/mesa/mesa -Git-commit: 6dc96de303290e8d1fc294da478c4f370be98dea -References: boo#1015012 fdo#93649 -Signed-off-by: Max Staudt - -This fixes random radeonsi GPU hangs in Batman Arkham: Origins (Wine) and -probably many other games too. - -cso_cache deletes sampler states when the cache size is too big and doesn't -check which sampler states are bound, causing use-after-free in drivers. -Because of that, radeonsi uploaded garbage sampler states and the hardware -went bananas. Other drivers may have experienced similar issues. - -Cc: 12.0 13.0 -Reviewed-by: Nicolai Hähnle -Reviewed-by: Edward O'Callaghan ---- - src/gallium/auxiliary/cso_cache/cso_cache.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c -index b240c93..1f3be4b 100644 ---- a/src/gallium/auxiliary/cso_cache/cso_cache.c -+++ b/src/gallium/auxiliary/cso_cache/cso_cache.c -@@ -188,7 +188,9 @@ cso_insert_state(struct cso_cache *sc, - void *state) - { - struct cso_hash *hash = _cso_hash_for_type(sc, type); -- sanitize_hash(sc, hash, type, sc->max_size); -+ -+ if (type != CSO_SAMPLER) -+ sanitize_hash(sc, hash, type, sc->max_size); - - return cso_hash_insert(hash, hash_key, state); - } diff --git a/mesa-13.0.2.tar.xz b/mesa-13.0.2.tar.xz deleted file mode 100644 index f14ecda..0000000 --- a/mesa-13.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6ed622645f4ed61da418bf65adde5bcc4bb79023c36ba7d6b45b389da4416d5 -size 9159100 diff --git a/mesa-13.0.2.tar.xz.sig b/mesa-13.0.2.tar.xz.sig deleted file mode 100644 index fdb5808894ee4a0b45747686ab226cf1c98e75bb57b6cde1fc49512d6a45eead..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-(+N~Qn`2@vhBH?S=0Ne%c~5CDi@hv_~0l>p9pW zrZf0I`Kqe(Kg%QP$e|-ybtcm9=O>%k8MQ0zWKp0J97K;39s#8h<`KW!ayoYs8?_e_ zYL)CR+OHV01&h!k^U;z1FZ+k^2t}}c3NuJD-i6fx&4*;O4@W}i@RxbKj8eI)K^;$( zp0u{$!GTEU+{YtFn%YwCJ_=a<`%&0YvLiK?HnC}#ks_;miWdGo!z3$AcOKcMo+Fc} z@CFf{nfXlGkeCg=ZVYpU1P00=61e#XR^Vw8wG<-dITFaqJ~D&~kuf+Ca*riA-jT2d zS2%c!Sq=@Rk*xWTsV5p@?ZG~U$Oz!`;Xl(k5a&rP-f#D zHITqI@GFMiI})DG`q*y2!Oh6Hu9mflqW?9|)|TId)=ST=Q{ZiI(?iP7fG2yMN#}i; zlc#PvI96tCf7%|4KUwG>+BqrLJhmyQ?H7-6`XiwzzZo h=z7HG4^^KKwdI~ejhiP8bLEdV|7dAab!=&E6_dwL1swnY diff --git a/mesa-13.0.3.tar.xz b/mesa-13.0.3.tar.xz new file mode 100644 index 0000000..6d759b7 --- /dev/null +++ b/mesa-13.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e +size 9162036 diff --git a/mesa-13.0.3.tar.xz.sig b/mesa-13.0.3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..90f8c30f01ae134d62c3bc96cc3aa477246ba74b47239dbf77261cba4b1a5c4f GIT binary patch literal 565 zcmV-50?Pe~0x|>u0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$6TrF#rk)5bdrv zuq^9I4fxp)^993Rw8-@U=-<^HT4ei86t1onwMcivU)ke=M=klvcz1?7Kz4MWjfMQM z`|7IH{QgD2|FH!I)A_uK_>eMMaHgi?qV1hs0dRzLe7T+uORvb!hZHRS8=Uf(5{+T_J5O@)Qs(_Z|yHb_6b) zV_~DHz`y_nzJ7(ve@|J(iAL>1la%e;#*b;>O?}%3RMB&uN~D60%4`+i)rqhMl=CJ* zkv##h^rsI7^|Lw$cF6H>XkFJoQzXj#wQj#sKprA1LS4(40Dm;2Ngik4zz4k z22C-tEoIJM5=8=aDfY8_R9{**hpU@O|lvJ3wkCMDU;nZ%7 z{pZgzN4bT*_tgEZKZdUuPN^NQcq`Q2(1I&r_<7Hu@9$K#*}2o8VY}GEd6dz2J{uIu D