diff --git a/.gitignore b/.gitignore index d438e38..7bd54a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-video-ati-18.1.0.tar.bz2 +SOURCES/xf86-video-ati-19.0.1.tar.bz2 diff --git a/.xorg-x11-drv-ati.metadata b/.xorg-x11-drv-ati.metadata index 25e3faa..266b8e0 100644 --- a/.xorg-x11-drv-ati.metadata +++ b/.xorg-x11-drv-ati.metadata @@ -1 +1 @@ -87beb7d09f5b722570adda9a5a1822cbd19e7059 SOURCES/xf86-video-ati-18.1.0.tar.bz2 +e8899c2d237381d9278429a1427e02fcba1d5174 SOURCES/xf86-video-ati-19.0.1.tar.bz2 diff --git a/SOURCES/0001-Avoid-RADEONLeaveVT_KMS-after-we-left-the-VT.patch b/SOURCES/0001-Avoid-RADEONLeaveVT_KMS-after-we-left-the-VT.patch new file mode 100644 index 0000000..56ed0a5 --- /dev/null +++ b/SOURCES/0001-Avoid-RADEONLeaveVT_KMS-after-we-left-the-VT.patch @@ -0,0 +1,34 @@ +From 779bafa175e6b47da086d84324f95cedd4dc487c Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Thu, 23 May 2019 16:26:15 +0200 +Subject: [PATCH] Avoid RADEONLeaveVT_KMS() after we left the VT + +RADEONLeaveVT_KMS() will un-reference its all-black FB in a timer, but +if we end calling RADEONLeaveVT_KMS() twice in a row, we may try to +access those after they've been just freed up, and crash. + +Return early in RADEONLeaveVT_KMS() if the VT semaphore is unset. + +Bugzilla: https://bugzilla.redhat.com/1674474 +Signed-off-by: Olivier Fourdan +--- + src/radeon_kms.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/radeon_kms.c b/src/radeon_kms.c +index ff4f8dcf..0d4d2ef4 100644 +--- a/src/radeon_kms.c ++++ b/src/radeon_kms.c +@@ -2624,6 +2624,9 @@ void RADEONLeaveVT_KMS(ScrnInfoPtr pScrn) + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, + "RADEONLeaveVT_KMS\n"); + ++ if (xf86ScreenToScrn(pScreen)->vtSema) ++ return; ++ + if (!info->r600_shadow_fb) { + RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); +-- +2.21.0 + diff --git a/SPECS/xorg-x11-drv-ati.spec b/SPECS/xorg-x11-drv-ati.spec index 36bbfde..550a688 100644 --- a/SPECS/xorg-x11-drv-ati.spec +++ b/SPECS/xorg-x11-drv-ati.spec @@ -12,7 +12,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati -Version: 18.1.0 +Version: 19.0.1 Release: 1%{?gver}%{?dist} URL: http://www.x.org License: MIT @@ -21,6 +21,8 @@ Group: User Interface/X Hardware Support Source0: https://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 #Source0: %{tarball}-%{gitdate}.tar.xz +Patch14: 0001-Avoid-RADEONLeaveVT_KMS-after-we-left-the-VT.patch + ExcludeArch: s390 s390x BuildRequires: xorg-x11-server-devel >= 1.10.99.902 @@ -41,6 +43,7 @@ X.Org X11 ati video driver. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}} +%patch14 -p1 -b .leavevt %build autoreconf -iv @@ -59,6 +62,12 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %{_datadir}/X11/xorg.conf.d/10-radeon.conf %changelog +* Wed Jun 12 2019 Olivier Fourdan - 19.0.1-1 +- ati 19.0.1 (#1719310) + +* Fri Jun 7 2019 Olivier Fourdan - 18.1.0-2 +- Avoid breakage on Xserver reset (#1717807) + * Tue Oct 16 2018 Adam Jackson - 18.1.0-1 - ati 18.1.0