From 18e7b60ca5101a9a5e0bf69c797b85eec80788d5 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 7 Dec 2020 00:56:42 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mesa.git#709d0a2cd134072cc32bf5372e20176bf533acd3 --- ...fix-regression-on-gpus-using-the-radeon-win.patch | 12 ++++++++++++ mesa.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch diff --git a/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch b/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch new file mode 100644 index 0000000..4a54e07 --- /dev/null +++ b/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch @@ -0,0 +1,12 @@ +diff -up mesa-20.3.0/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c.dma mesa-20.3.0/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +--- mesa-20.3.0/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c.dma 2020-12-04 03:59:53.578230900 +1000 ++++ mesa-20.3.0/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c 2020-12-07 10:01:07.602269090 +1000 +@@ -530,6 +530,8 @@ static bool do_winsys_init(struct radeon + } + } + ++ ws->info.num_se = ws->info.max_se; ++ + radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_SH_PER_SE, NULL, + &ws->info.max_sh_per_se); + if (ws->gen == DRV_SI) { diff --git a/mesa.spec b/mesa.spec index fd273d9..9b64b60 100644 --- a/mesa.spec +++ b/mesa.spec @@ -52,7 +52,7 @@ Name: mesa Summary: Mesa graphics libraries %global ver 20.3.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org @@ -62,6 +62,8 @@ Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source1: Mesa-MLAA-License-Clarification-Email.txt +Patch0: 0001-radeonsi-fix-regression-on-gpus-using-the-radeon-win.patch + BuildRequires: meson >= 0.45 BuildRequires: gcc BuildRequires: gcc-c++ @@ -591,6 +593,9 @@ popd %endif %changelog +* Mon Dec 07 2020 Dave Airlie - 20.3.0-2 +- Fix regression with radeon si/cik cards + * Fri Dec 04 2020 Dave Airlie - 20.3.0-1 - Update to 20.3.0 release