summaryrefslogtreecommitdiff
path: root/user/xf86-video-ati
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-02 16:50:07 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-02 16:50:07 +0000
commit204843f672d41ab08c1ede03eaa5f032691bfdb3 (patch)
tree3a7fb5253c4ae1183cca22a38d856ce7645de4cd /user/xf86-video-ati
parent0da94e6962c19e4f0835622bce5082ab4343711b (diff)
downloadpackages-204843f672d41ab08c1ede03eaa5f032691bfdb3.tar.gz
packages-204843f672d41ab08c1ede03eaa5f032691bfdb3.tar.bz2
packages-204843f672d41ab08c1ede03eaa5f032691bfdb3.tar.xz
packages-204843f672d41ab08c1ede03eaa5f032691bfdb3.zip
user/xf86-video-ati: Fix segfault
Diffstat (limited to 'user/xf86-video-ati')
-rw-r--r--user/xf86-video-ati/APKBUILD9
-rw-r--r--user/xf86-video-ati/null-deref-exa.patch77
2 files changed, 83 insertions, 3 deletions
diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD
index e73509e18..4bce3a851 100644
--- a/user/xf86-video-ati/APKBUILD
+++ b/user/xf86-video-ati/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xf86-video-ati
pkgver=19.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="ATI video driver for X11"
url="https://www.X.Org/"
arch="all"
@@ -11,7 +11,9 @@ depends="mesa-dri-ati"
makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros
xorg-server-dev"
subpackages="$pkgname-doc"
-source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+ null-deref-exa.patch
+ "
build() {
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
@@ -27,4 +29,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2"
+sha512sums="73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2
+f9c6928f741014b47b302c2f2cf6a0110fcc0935cb3a2725e37f8b48e9cd778639231110b9a4ce67ad38174b21b47864ff0793f9181347c21ef694bedbc44b0b null-deref-exa.patch"
diff --git a/user/xf86-video-ati/null-deref-exa.patch b/user/xf86-video-ati/null-deref-exa.patch
new file mode 100644
index 000000000..dd13e9b60
--- /dev/null
+++ b/user/xf86-video-ati/null-deref-exa.patch
@@ -0,0 +1,77 @@
+From a8168153037f2cfb9739285b92896c0e24872518 Mon Sep 17 00:00:00 2001
+From: Alexey Sheplyakov <asheplyakov@altlinux.org>
+Date: Wed, 27 Nov 2019 20:50:58 +0400
+Subject: [PATCH] Don't crash X server if GPU acceleration is not available
+
+Commit d1d8e3c8d0a0a0394d395eba171460501745209b causes X server
+to fail on startup when GPU acceleration is not working (or is
+disabled). The reason is that `radeon_get_pixmap_bo` function
+gets called too early (before EXA has been initialized) and
+fails with an assert:
+
+ #0 __GI_raise (sig=<optimized out>) at ../sysdeps/unix/sysv/linux/raise.c:50
+ #1 0x76ab1c6c in __GI_abort () at abort.c:79
+ #2 0x76ac0b64 in __assert_fail_base (fmt=0x76bfbce4 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7658c80c "key->initialized", file=<optimized out>, line=121,
+ function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:92
+ #3 0x76ac0c0c in __GI___assert_fail (assertion=0x7658c80c "key->initialized", file=0x7658c9d0 "../include/privates.h", line=121,
+ function=0x7658d040 <__PRETTY_FUNCTION__.10607> "dixGetPrivateAddr") at assert.c:101
+ #4 0x76579e6c in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at ../include/privates.h:121
+ #5 0x7657a954 in dixGetPrivateAddr (key=<optimized out>, key=<optimized out>, privates=<optimized out>) at exa.c:70
+ #6 dixGetPrivate (key=<optimized out>, privates=<optimized out>) at ../include/privates.h:136
+ #7 exaGetPixmapDriverPrivate (pPix=<optimized out>) at exa.c:68
+ #8 0x7623d460 in radeon_get_pixmap_bo (pPix=0x71c1b8) at radeon.h:804
+ #9 radeon_get_pixmap_handle (pixmap=0x71c1b8, handle=0x7fa22328) at radeon_bo_helper.c:357
+ #10 0x76244458 in radeon_pixmap_get_fb (pix=0x71c1b8) at radeon.h:886
+ #11 drmmode_set_mode_major (crtc=0x691860, mode=0x69191c, rotation=<optimized out>, x=<optimized out>, y=<optimized out>) at drmmode_display.c:918
+ #12 0x762467e8 in drmmode_set_desired_modes (pScrn=0x67c678, drmmode=<optimized out>, set_hw=1) at drmmode_display.c:3128
+ #13 0x0047bfa4 in MapWindow (client=0x669ec8, pWin=0x7206c0) at window.c:2722
+ #14 MapWindow (pWin=0x7206c0, client=0x669ec8) at window.c:2665
+ #15 0x00449650 in dix_main (argc=3, argv=0x7fa22604, envp=<optimized out>) at main.c:247
+ #16 0x76ab2198 in __libc_start_main (main=0x42db10 <main>, argc=3, argv=0x7fa22604, init=<optimized out>, fini=0x606434 <__libc_csu_fini>, rtld_fini=0x77229930 <_dl_fini>,
+ stack_end=0x7fa225e0) at libc-start.c:308
+ #17 0x0042db80 in __start () at ../sysdeps/mips/start.S:110
+
+Don't call `exaGetPixmapDriverPrivate` if the acceleration (EXA) is not
+enabled [yet] to avoid the problem.
+
+Closes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/issues/188
+Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539
+---
+ src/radeon.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/radeon.h b/src/radeon.h
+index 2c913466..e4a2ba66 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo
+
+ static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
+ {
+-#ifdef USE_GLAMOR
+ RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(pPix->drawable.pScreen));
++#ifdef USE_GLAMOR
+
+ if (info->use_glamor) {
+ struct radeon_pixmap *priv;
+@@ -799,7 +799,7 @@ static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)
+ return priv ? priv->bo : NULL;
+ } else
+ #endif
+- {
++ if (info->accelOn) {
+ struct radeon_exa_pixmap_priv *driver_priv;
+ driver_priv = exaGetPixmapDriverPrivate(pPix);
+ return driver_priv ? driver_priv->bo : NULL;
+@@ -896,7 +896,7 @@ radeon_pixmap_get_fb(PixmapPtr pix)
+ handle);
+ }
+
+- return *fb_ptr;
++ return fb_ptr ? *fb_ptr : NULL;
+ }
+
+
+--
+2.24.1
+