diff --git a/0001-dri3-Always-flush-glamor-before-sharing-pixmap-stora.patch b/0001-dri3-Always-flush-glamor-before-sharing-pixmap-stora.patch deleted file mode 100644 index 6d00307..0000000 --- a/0001-dri3-Always-flush-glamor-before-sharing-pixmap-stora.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f758908db4e71406e5d437d32e43aabd38a63504 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Thu, 9 May 2019 12:35:37 +0200 -Subject: [PATCH xf86-video-ati] dri3: Always flush glamor before sharing - pixmap storage with clients - -Even if glamor_gbm_bo_from_pixmap / glamor_fd_from_pixmap themselves -don't trigger any drawing, there could already be unflushed drawing to -the pixmap whose storage we share with a client. - -(Ported from amdgpu commit 4b17533fcb30842caf0035ba593b7d986520cc85) -Acked-by: Alex Deucher ---- - src/radeon_dri3.c | 26 +++++--------------------- - 1 file changed, 5 insertions(+), 21 deletions(-) - -diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c -index 73353bf5..f8f91c4b 100644 ---- a/src/radeon_dri3.c -+++ b/src/radeon_dri3.c -@@ -220,29 +220,13 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen, - RADEONInfoPtr info = RADEONPTR(scrn); - - if (info->use_glamor) { -- Bool need_flush = TRUE; -- int ret = -1; --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,19,99,904,0) -- struct gbm_bo *gbm_bo = glamor_gbm_bo_from_pixmap(screen, pixmap); -+ int ret = glamor_fd_from_pixmap(screen, pixmap, stride, size); - -- if (gbm_bo) { -- ret = gbm_bo_get_fd(gbm_bo); -- gbm_bo_destroy(gbm_bo); -- -- if (ret >= 0) -- need_flush = FALSE; -- } --#endif -- -- if (ret < 0) -- ret = glamor_fd_from_pixmap(screen, pixmap, stride, size); -- -- /* glamor might have needed to reallocate the pixmap storage and -- * copy the pixmap contents to the new storage. The copy -- * operation needs to be flushed to the kernel driver before the -- * client starts using the pixmap storage for direct rendering. -+ /* Any pending drawing operations need to be flushed to the -+ * kernel driver before the client starts using the pixmap -+ * storage for direct rendering. - */ -- if (ret >= 0 && need_flush) -+ if (ret >= 0) - radeon_cs_flush_indirect(scrn); - - return ret; --- -2.21.0 - diff --git a/xf86-video-ati-19.0.1.tar.bz2 b/xf86-video-ati-19.0.1.tar.bz2 deleted file mode 100644 index 2abe05e..0000000 Binary files a/xf86-video-ati-19.0.1.tar.bz2 and /dev/null differ diff --git a/xf86-video-ati-19.1.0.tar.bz2 b/xf86-video-ati-19.1.0.tar.bz2 new file mode 100644 index 0000000..ed6b5bd Binary files /dev/null and b/xf86-video-ati-19.1.0.tar.bz2 differ diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index a0eb603..f902a99 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -3,14 +3,12 @@ %undefine _hardened_build Name: xorg-x11-drv-ati -Version: 19.0.1 -Release: 2 +Version: 19.1.0 +Release: 1 Summary: Xorg X11 ati video driver License: MIT URL: https://www.x.org Source0: https://www.x.org/pub/individual/driver/xf86-video-ati-%{version}.tar.bz2 -Patch1: 0001-dri3-Always-flush-glamor-before-sharing-pixmap-stora.patch - BuildRequires: pkgconfig(gbm) >= 10.6 libdrm-devel kernel-headers BuildRequires: automake autoconf libtool pkgconfig xorg-x11-util-macros @@ -48,6 +46,12 @@ autoreconf -iv %{_mandir}/man4/*.4* %changelog +* Thu Jan 09 2020 openEuler Buildteam - 19.1.0-1 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:update version to 19.1.0 + * Sat Oct 26 2019 openEuler Buildteam - 19.0.1-2 - Type:enhancement - Id:NA