SHA256
1
0
forked from pool/Mesa

Accepting request 614240 from home:mimi_vx:branches:X11:XOrg

- Update to 18.1.1
- drop U_dri3-Stricter-SBC-wraparound-handling.patch
 * Radv fixed one extension and several features on a per-generation basis.
 * Vulkan got fixes for a potential free of uninitialized memory
 * Tegra got modifier fixes.
 * nv30 fixed displayable formats.
 * i965 now works correctly for GLK 2x6 systems.

- Update to 18.1.1
- drop U_dri3-Stricter-SBC-wraparound-handling.patch
 * Radv fixed one extension and several features on a per-generation basis.
 * Vulkan got fixes for a potential free of uninitialized memory
 * Tegra got modifier fixes.
 * nv30 fixed displayable formats.
 * i965 now works correctly for GLK 2x6 systems.

OBS-URL: https://build.opensuse.org/request/show/614240
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=749
This commit is contained in:
Stefan Dirsch 2018-06-05 12:05:37 +00:00 committed by Git OBS Bridge
parent 6c1c346b50
commit af5eeb5b5d
9 changed files with 30 additions and 62 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Jun 2 15:44:36 UTC 2018 - mimi.vx@gmail.com
- Update to 18.1.1
- drop U_dri3-Stricter-SBC-wraparound-handling.patch
* Radv fixed one extension and several features on a per-generation basis.
* Vulkan got fixes for a potential free of uninitialized memory
* Tegra got modifier fixes.
* nv30 fixed displayable formats.
* i965 now works correctly for GLK 2x6 systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 22 16:08:15 UTC 2018 - tobias.johannes.klausmann@mni.thm.de Tue May 22 16:08:15 UTC 2018 - tobias.johannes.klausmann@mni.thm.de

View File

@ -43,7 +43,7 @@
%define glamor 1 %define glamor 1
%define _name_archive mesa %define _name_archive mesa
%define _version 18.1.0 %define _version 18.1.1
%define with_opencl 0 %define with_opencl 0
%define with_vulkan 0 %define with_vulkan 0
%define with_llvm 0 %define with_llvm 0
@ -113,7 +113,7 @@
%endif %endif
Name: Mesa-drivers Name: Mesa-drivers
Version: 18.1.0 Version: 18.1.1
Release: 0 Release: 0
Summary: System for rendering 3-D graphics Summary: System for rendering 3-D graphics
License: MIT License: MIT
@ -140,8 +140,6 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
# Already upstream
Patch100: U_dri3-Stricter-SBC-wraparound-handling.patch
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
@ -752,7 +750,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch43 -p1 %patch43 -p1
%patch44 -p1 %patch44 -p1
%patch47 -p1 %patch47 -p1
%patch100 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ... # disabling libglvnd build; ugly ...

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Jun 2 15:44:36 UTC 2018 - mimi.vx@gmail.com
- Update to 18.1.1
- drop U_dri3-Stricter-SBC-wraparound-handling.patch
* Radv fixed one extension and several features on a per-generation basis.
* Vulkan got fixes for a potential free of uninitialized memory
* Tegra got modifier fixes.
* nv30 fixed displayable formats.
* i965 now works correctly for GLK 2x6 systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 22 16:08:15 UTC 2018 - tobias.johannes.klausmann@mni.thm.de Tue May 22 16:08:15 UTC 2018 - tobias.johannes.klausmann@mni.thm.de

View File

@ -42,7 +42,7 @@
%define glamor 1 %define glamor 1
%define _name_archive mesa %define _name_archive mesa
%define _version 18.1.0 %define _version 18.1.1
%define with_opencl 0 %define with_opencl 0
%define with_vulkan 0 %define with_vulkan 0
%define with_llvm 0 %define with_llvm 0
@ -112,7 +112,7 @@
%endif %endif
Name: Mesa Name: Mesa
Version: 18.1.0 Version: 18.1.1
Release: 0 Release: 0
Summary: System for rendering 3-D graphics Summary: System for rendering 3-D graphics
License: MIT License: MIT
@ -139,8 +139,6 @@ Patch32: archlinux_glvnd-fix-gl-dot-pc.patch
Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch Patch43: u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch Patch44: u_intel_anv-make-scripts-python-2-3-compat.patch
Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch Patch47: u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
# Already upstream
Patch100: U_dri3-Stricter-SBC-wraparound-handling.patch
BuildRequires: autoconf >= 2.60 BuildRequires: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
@ -751,7 +749,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch43 -p1 %patch43 -p1
%patch44 -p1 %patch44 -p1
%patch47 -p1 %patch47 -p1
%patch100 -p1
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
# disabling libglvnd build; ugly ... # disabling libglvnd build; ugly ...

View File

@ -1,48 +0,0 @@
From fe2edb25dd5628c395a65b60998f11e839d2b458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
Date: Tue, 8 May 2018 11:51:09 +0200
Subject: [PATCH] dri3: Stricter SBC wraparound handling
Prevents corrupting the upper 32 bits of draw->recv_sbc when
draw->send_sbc resets to 0 (which currently happens when the window is
unbound from a context and bound to one again), which in turn caused
loader_dri3_swap_buffers_msc to calculate target_msc with corrupted
upper 32 bits. This resulted in hangs with the Xorg modesetting driver
as of xserver 1.20 (older versions and other drivers ignored the upper
32 bits of the target MSC, which is why this wasn't noticed earlier).
Cc: mesa-stable@lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/106351
Tested-by: Mike Lothian <mike@fireburn.co.uk>
---
src/loader/loader_dri3_helper.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
index 6db8303d26..f0ff2f07bd 100644
--- a/src/loader/loader_dri3_helper.c
+++ b/src/loader/loader_dri3_helper.c
@@ -370,9 +370,17 @@ dri3_handle_present_event(struct loader_dri3_drawable *draw,
* checking for wrap.
*/
if (ce->kind == XCB_PRESENT_COMPLETE_KIND_PIXMAP) {
- draw->recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial;
- if (draw->recv_sbc > draw->send_sbc)
- draw->recv_sbc -= 0x100000000;
+ uint64_t recv_sbc = (draw->send_sbc & 0xffffffff00000000LL) | ce->serial;
+
+ /* Only assume wraparound if that results in exactly the previous
+ * SBC + 1, otherwise ignore received SBC > sent SBC (those are
+ * probably from a previous loader_dri3_drawable instance) to avoid
+ * calculating bogus target MSC values in loader_dri3_swap_buffers_msc
+ */
+ if (recv_sbc <= draw->send_sbc)
+ draw->recv_sbc = recv_sbc;
+ else if (recv_sbc == (draw->recv_sbc + 0x100000001ULL))
+ draw->recv_sbc = recv_sbc - 0x100000000ULL;
/* When moving from flip to copy, we assume that we can allocate in
* a more optimal way if we don't need to cater for the display
--
2.16.3

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c855c5b67ef993b7621f76d8b120769ec0415f1c3616eaff44ef7f7f300aceba
size 11118776

View File

@ -1 +0,0 @@
3da4b5f4ae3705c017a8f988f1304be45eed875f mesa-18.1.0.tar.xz

3
mesa-18.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781
size 11110892

View File

@ -0,0 +1 @@
60d6b58f8f119b3731de587bdad30c1ecbb52678 mesa-18.1.1.tar.xz