0001-dri3-Always-flush-glamor-before-sharing-pixmap-stora.patch

@@ -0,0 +1,58 @@
+From f758908db4e71406e5d437d32e43aabd38a63504 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
+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 <alexander.deucher@amd.com>
+---
+ 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
+

backport-Fix-link-failure-with-gcc-10.patch

@@ -1,28 +0,0 @@
-From edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 4 Feb 2020 16:38:06 -0500
-Subject: [PATCH xf86-video-amdgpu] Fix link failure with gcc 10
- 
-Without the 'extern' this looks like a definition not just a
-declaration, in every file that includes the header. gcc 10 is stricter
-about this kind of multiple definition.
----
- src/drmmode_display.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/drmmode_display.h b/src/drmmode_display.h
-index 96eaef0..8cd8a0a 100644
---- a/src/drmmode_display.h
-+++ b/src/drmmode_display.h
-@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type,
- 			 uint64_t *ust, uint32_t *result_seq);
- 
- 
--miPointerSpriteFuncRec drmmode_sprite_funcs;
-+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
- 
- 
- #endif
--- 
-1.8.3.1
-

xorg-x11-drv-ati.spec

@@ -3,14 +3,14 @@
 %undefine _hardened_build
 
 Name:           xorg-x11-drv-ati
-Version:        19.1.0
-Release:        4
+Version:        19.0.1
+Release:        2
 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
 
-Patch6000:	backport-Fix-link-failure-with-gcc-10.patch
 
 BuildRequires:  pkgconfig(gbm) >= 10.6 libdrm-devel kernel-headers
 BuildRequires:  automake autoconf libtool pkgconfig xorg-x11-util-macros
@@ -31,9 +31,6 @@ autoreconf -iv
 %configure --enable-glamor
 %make_build
 
-%check
-make check
-
 %install
 %make_install
 %delete_la
@@ -51,24 +48,6 @@ make check
 %{_mandir}/man4/*.4*
 
 %changelog
-* Tue Oct 25 2022 wangkerong <wangkerong@h-partners.com> - 19.1.0-4
-- rebuild for next release
-
-* Fri Jul 30 2021 yangcheng <yangcheng87@huawei.com> - 19.1.0-3
-- Fix compilation failure caused by gcc 
-
-* Fri Mar 13 2020 openEuler Buildteam <buildteam@openeuler.org> - 19.1.0-2
-- Type:enhancement
-- Id:NA
-- SUG:NA
-- DESC:enable make check
-
-* Thu Jan 09 2020 openEuler Buildteam <buildteam@openeuler.org> - 19.1.0-1
-- Type:enhancement
-- Id:NA
-- SUG:NA
-- DESC:update version to 19.1.0
-
 * Sat Oct 26 2019 openEuler Buildteam <buildteam@openeuler.org> - 19.0.1-2
 - Type:enhancement
 - Id:NA

xorg-x11-drv-ati.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: eurolinux-enterprise-linux-sources/xorg-x11-font-utils
-tag_prefix: 
-seperator: .