Date: Thursday, December 31, 2020 @ 07:24:01 Author: lcarlier Revision: 405147
archrelease: copy trunk to testing-x86_64 Added: mesa/repos/testing-x86_64/ mesa/repos/testing-x86_64/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch (from rev 405146, mesa/trunk/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch) mesa/repos/testing-x86_64/LICENSE (from rev 405146, mesa/trunk/LICENSE) mesa/repos/testing-x86_64/PKGBUILD (from rev 405146, mesa/trunk/PKGBUILD) --------------------------------------------------------------------+ 0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch | 35 + LICENSE | 83 +++ PKGBUILD | 219 ++++++++++ 3 files changed, 337 insertions(+) Copied: mesa/repos/testing-x86_64/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch (from rev 405146, mesa/trunk/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch) =================================================================== --- testing-x86_64/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch (rev 0) +++ testing-x86_64/0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch 2020-12-31 07:24:01 UTC (rev 405147) @@ -0,0 +1,35 @@ +From 7c075bae56e45f268e62efcd82589111bce92ae3 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airl...@redhat.com> +Date: Mon, 7 Dec 2020 09:47:35 +1000 +Subject: [PATCH] radeonsi: fix regression on gpus using the radeon winsys. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For GPUs using the radeon kernel driver, num_se was never +getting initialised. + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3939 +Fixes: f2977a162af4 ("ac: fix min/max_good_num_cu_per_sa on gfx10.3 with disabled SEs") +Reviewed-by: Marek Olšák <marek.ol...@amd.com> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7954> +--- + src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +index 0aab59cd236..ef7434d7589 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c ++++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +@@ -530,6 +530,8 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws) + } + } + ++ ws->info.num_se = ws->info.max_se; ++ + radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_SH_PER_SE, NULL, + &ws->info.max_sa_per_se); + if (ws->gen == DRV_SI) { +-- +GitLab + Copied: mesa/repos/testing-x86_64/LICENSE (from rev 405146, mesa/trunk/LICENSE) =================================================================== --- testing-x86_64/LICENSE (rev 0) +++ testing-x86_64/LICENSE 2020-12-31 07:24:01 UTC (rev 405147) @@ -0,0 +1,83 @@ +The Mesa 3D Graphics Library + +Disclaimer + + Mesa is a 3-D graphics library with an API which is very similar to + that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command + syntax or state machine, it is being used with authorization from + [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an + OpenGL license from SGI, and makes no claim that Mesa is in any way a + compatible replacement for OpenGL or associated with SGI. Those who + want a licensed implementation of OpenGL should contact a licensed + vendor. + + Please do not refer to the library as MesaGL (for legal reasons). It's + just Mesa or The Mesa 3-D graphics library. + + * OpenGL is a trademark of [3]Silicon Graphics Incorporated. + +License / Copyright Information + + The Mesa distribution consists of several components. Different + copyrights and licenses apply to different components. For example, the + GLX client code uses the SGI Free Software License B, and some of the + Mesa device drivers are copyrighted by their authors. See below for a + list of Mesa's main components and the license for each. + + The core Mesa library is licensed according to the terms of the MIT + license. This allows integration with the XFree86, Xorg and DRI + projects. + + The default Mesa license is as follows: + +Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Attention, Contributors + + When contributing to the Mesa project you must agree to the licensing + terms of the component to which you're contributing. The following + section lists the primary components of the Mesa distribution and their + respective licenses. + +Mesa Component Licenses + +Component Location License +------------------------------------------------------------------ +Main Mesa code src/mesa/ MIT + +Device drivers src/mesa/drivers/* MIT, generally + +Gallium code src/gallium/ MIT + +Ext headers include/GL/glext.h Khronos + include/GL/glxext.h + +GLX client code src/glx/ SGI Free Software License B + +C11 thread include/c11/threads*.h Boost (permissive) emulation + + In general, consult the source files for license terms. + +References + + 1. https://www.opengl.org/ + 2. https://www.sgi.com/ + 3. https://www.sgi.com/ Copied: mesa/repos/testing-x86_64/PKGBUILD (from rev 405146, mesa/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2020-12-31 07:24:01 UTC (rev 405147) @@ -0,0 +1,219 @@ +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> + +pkgbase=mesa +pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') +pkgdesc="An open-source implementation of the OpenGL specification" +pkgver=20.3.2 +pkgrel=1 +arch=('x86_64') +makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm' + 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm' + 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr' + 'valgrind' 'glslang' 'vulkan-icd-loader' 'meson') +url="https://www.mesa3d.org/" +license=('custom') +source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} + 0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch + LICENSE) +sha512sums=('0cabf8ddfd20b56098c8f4c081a3c2d4741ef42f40c929645e74284db99cf2a81137d7d279b7b6a0c15dea83905119ddf612411b36344dc22a488de9f311f5ed' + 'SKIP' + 'a133f5689e1007dc43234ed6a022f83c5ffbb256ed6207c73e30bee221c2617820aa8848e17d7f14fa629b4907a115c4f8a033dc40c7b53c473c2eef26bf8bf6' + 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7') +validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.veli...@gmail.com> + '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <ta...@igalia.com> + 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasua...@igalia.com> + 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasua...@igalia.com> + '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dy...@pnwbakers.com> + '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <e...@engestrom.ch> + +prepare() { + cd mesa-$pkgver + + patch -Np1 < ../0001-radeonsi-fix-regression-on-gpus-using-the-radeon-winsys.patch +} + +build() { + arch-meson mesa-$pkgver build \ + -D b_lto=true \ + -D b_ndebug=true \ + -D platforms=x11,wayland \ + -D dri-drivers=i915,i965,r100,r200,nouveau \ + -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris,zink \ + -D vulkan-drivers=amd,intel,swrast \ + -D vulkan-overlay-layer=true \ + -D vulkan-device-select-layer=true \ + -D swr-arches=avx,avx2 \ + -D dri3=enabled \ + -D egl=enabled \ + -D gallium-extra-hud=true \ + -D gallium-nine=true \ + -D gallium-omx=bellagio \ + -D gallium-opencl=icd \ + -D gallium-va=enabled \ + -D gallium-vdpau=enabled \ + -D gallium-xa=enabled \ + -D gallium-xvmc=disabled \ + -D gbm=enabled \ + -D gles1=disabled \ + -D gles2=enabled \ + -D glvnd=true \ + -D glx=dri \ + -D libunwind=enabled \ + -D llvm=enabled \ + -D lmsensors=enabled \ + -D osmesa=gallium \ + -D shared-glapi=enabled \ + -D valgrind=enabled + + # Print config + meson configure build + + ninja -C build + meson compile -C build + + # fake installation to be seperated into packages + # outside of fakeroot but mesa doesn't need to chown/mod + DESTDIR="${srcdir}/fakeinstall" meson install -C build +} + +_install() { + local src f dir + for src; do + f="${src#fakeinstall/}" + dir="${pkgdir}/${f%/*}" + install -m755 -d "${dir}" + mv -v "${src}" "${dir}/" + done +} + +package_vulkan-mesa-layers() { + pkgdesc="Mesa's Vulkan layers" + depends=('libdrm' 'libxcb' 'wayland' 'python') + conflicts=('vulkan-mesa-layer') + replaces=('vulkan-mesa-layer') + + _install fakeinstall/usr/share/vulkan/explicit_layer.d + _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so + _install fakeinstall/usr/bin/mesa-overlay-control.py + + _install fakeinstall/usr/share/vulkan/implicit_layer.d + _install fakeinstall/usr/lib/libVkLayer_MESA_device_select.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_opencl-mesa() { + pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers" + depends=('libdrm' 'libclc' 'clang') + optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-driver') + + _install fakeinstall/etc/OpenCL + _install fakeinstall/usr/lib/lib*OpenCL* + _install fakeinstall/usr/lib/gallium-pipe + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_vulkan-intel() { + pkgdesc="Intel's Vulkan mesa driver" + depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd') + optdepends=('vulkan-mesa-layers: additional vulkan layers') + provides=('vulkan-driver') + + _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json + _install fakeinstall/usr/lib/libvulkan_intel.so + _install fakeinstall/usr/include/vulkan/vulkan_intel.h + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_vulkan-radeon() { + pkgdesc="Radeon's Vulkan mesa driver" + depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs') + optdepends=('vulkan-mesa-layers: additional vulkan layers') + provides=('vulkan-driver') + + _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json + _install fakeinstall/usr/lib/libvulkan_radeon.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_vulkan-swrast() { + pkgdesc="Vulkan software rasteriser driver" + depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs') + optdepends=('vulkan-mesa-layers: additional vulkan layers') + conflicts=('vulkan-mesa') + replaces=('vulkan-mesa') + provides=('vulkan-driver') + + _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json + _install fakeinstall/usr/lib/libvulkan_lvp.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_libva-mesa-driver() { + pkgdesc="VA-API implementation for gallium" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') + + _install fakeinstall/usr/lib/dri/*_drv_video.so + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_mesa-vdpau() { + pkgdesc="Mesa VDPAU drivers" + depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence') + + _install fakeinstall/usr/lib/vdpau + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +} + +package_mesa() { + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' + 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd' + 'zstd' 'vulkan-icd-loader') + optdepends=('opengl-man-pages: for the OpenGL API man pages' + 'mesa-vdpau: for accelerated video playback' + 'libva-mesa-driver: for accelerated video playback') + provides=('mesa-libgl' 'opengl-driver') + conflicts=('mesa-libgl') + replaces=('mesa-libgl') + + _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf + _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json + + # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr + _install fakeinstall/usr/lib/dri/*_dri.so + + _install fakeinstall/usr/lib/bellagio + _install fakeinstall/usr/lib/d3d + _install fakeinstall/usr/lib/lib{gbm,glapi}.so* + _install fakeinstall/usr/lib/libOSMesa.so* + _install fakeinstall/usr/lib/libxatracker.so* + _install fakeinstall/usr/lib/libswrAVX*.so* + + # in vulkan-headers + rm -rv fakeinstall/usr/include/vulkan + + _install fakeinstall/usr/include + _install fakeinstall/usr/lib/pkgconfig + + # libglvnd support + _install fakeinstall/usr/lib/libGLX_mesa.so* + _install fakeinstall/usr/lib/libEGL_mesa.so* + + # indirect rendering + ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0" + + # make sure there are no files left to install + find fakeinstall -depth -print0 | xargs -0 rmdir + + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE +}