* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-ati/files/, x11-drivers/xf86-video-ati/
@ 2020-05-01 18:54 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-05-01 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 1089c0fa030301e8f4d29c04552ac1cbff1bd645
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 1 18:48:58 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 1 18:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1089c0fa
x11-drivers/xf86-video-ati: Add patch for GCC-10
Closes: https://bugs.gentoo.org/720266
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...o-ati-19.1.0-Fix-link-failure-with-gcc-10.patch | 33 ++++++++++++++++++++++
.../xf86-video-ati/xf86-video-ati-19.1.0.ebuild | 4 +++
2 files changed, 37 insertions(+)
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
new file mode 100644
index 00000000000..e0375b0826c
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
@@ -0,0 +1,33 @@
+From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 4 Feb 2020 16:38:06 -0500
+Subject: [PATCH] Fix link failure with gcc 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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.
+
+Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
+---
+ 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 96eaef0a..8cd8a0a6 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
+--
+2.26.2
+
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
index f0b151ac4ac..5350c72cb74 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0.ebuild
@@ -24,6 +24,10 @@ RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
DEPEND="${RDEPEND}
x11-base/xorg-proto"
+PATCHES=(
+ "${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
+)
+
pkg_pretend() {
if use kernel_linux ; then
if kernel_is -ge 3 9; then
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-ati/files/, x11-drivers/xf86-video-ati/
@ 2021-11-30 22:23 Piotr Karbowski
0 siblings, 0 replies; 3+ messages in thread
From: Piotr Karbowski @ 2021-11-30 22:23 UTC (permalink / raw
To: gentoo-commits
commit: ced1d784c29c3864cc65e987cedb65ebb9c57543
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 22:22:23 2021 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 22:23:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced1d784
x11-drivers/xf86-video-ati: 19.1.0-r1: fix building with new xserver.
Closes: https://bugs.gentoo.org/827872
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
...6-video-ati-19.1.0-xserver-21-build-fixes.patch | 368 +++++++++++++++++++++
.../xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild | 54 +++
2 files changed, 422 insertions(+)
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
new file mode 100644
index 000000000000..6666e0af6916
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
@@ -0,0 +1,368 @@
+From 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Mon, 13 Jul 2020 09:11:28 +1000
+Subject: ati: cleanup terminology to use primary/secondary
+
+The X server changed some API/ABIs here.
+
+Based on amdgpu patch by Michel
+---
+ man/radeon.man | 2 +-
+ src/compat-api.h | 6 +++++
+ src/drmmode_display.c | 4 +--
+ src/evergreen_state.h | 2 +-
+ src/r600_state.h | 2 +-
+ src/radeon.h | 10 +++----
+ src/radeon_exa.c | 2 +-
+ src/radeon_glamor.c | 2 +-
+ src/radeon_kms.c | 74 +++++++++++++++++++++++++--------------------------
+ 9 files changed, 55 insertions(+), 49 deletions(-)
+
+diff --git a/man/radeon.man b/man/radeon.man
+index dcebf537..247dcdb7 100644
+--- a/man/radeon.man
++++ b/man/radeon.man
+@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
+ accordingly. If this option isn't set, the default value of the property is
+ .B auto,
+ which means that TearFree is on for rotated outputs, outputs with RandR
+-transforms applied and for RandR 1.4 slave outputs, otherwise off.
++transforms applied and for RandR 1.4 secondary outputs, otherwise off.
+ .TP
+ .BI "Option \*qAccelMethod\*q \*q" "string" \*q
+ Chooses between available acceleration architectures. Valid values are
+diff --git a/src/compat-api.h b/src/compat-api.h
+index f4e7524f..def6d3e4 100644
+--- a/src/compat-api.h
++++ b/src/compat-api.h
+@@ -34,4 +34,10 @@
+ #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
+ #endif
+
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
++#define current_primary current_master
++#define primary_pixmap master_pixmap
++#define secondary_dst slave_dst
++#endif
++
+ #endif
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 72f96a0c..3099a729 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
+ xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
+ ent) {
+ if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+- dirty->slave_dst =
++ dirty->secondary_dst =
+ drmmode_crtc->scanout[scanout_id].pixmap;
+ break;
+ }
+@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
+
+ xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
+ if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
++ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
+ break;
+ }
+ }
+diff --git a/src/evergreen_state.h b/src/evergreen_state.h
+index 7e54e1c7..34ba87b6 100644
+--- a/src/evergreen_state.h
++++ b/src/evergreen_state.h
+@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
+ int *new_pitch);
+ extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
+ extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
+-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
+ extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
+
+ #endif
+diff --git a/src/r600_state.h b/src/r600_state.h
+index 34345996..567c3ca2 100644
+--- a/src/r600_state.h
++++ b/src/r600_state.h
+@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
+ int *new_pitch);
+ extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
+ extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
+-extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
++extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
+ extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
+ #endif
+diff --git a/src/radeon.h b/src/radeon.h
+index e4a2ba66..68d7756a 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -182,18 +182,18 @@ typedef enum {
+
+
+ static inline ScreenPtr
+-radeon_master_screen(ScreenPtr screen)
++radeon_primary_screen(ScreenPtr screen)
+ {
+- if (screen->current_master)
+- return screen->current_master;
++ if (screen->current_primary)
++ return screen->current_primary;
+
+ return screen;
+ }
+
+ static inline ScreenPtr
+-radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
++radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
+ {
+- return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
++ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
+ }
+
+ static inline DrawablePtr
+diff --git a/src/radeon_exa.c b/src/radeon_exa.c
+index 268155ed..320ff992 100644
+--- a/src/radeon_exa.c
++++ b/src/radeon_exa.c
+@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
+ free(driverPriv);
+ }
+
+-Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
++Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
+ {
+ struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
+
+diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
+index f1098381..ccf99941 100644
+--- a/src/radeon_glamor.c
++++ b/src/radeon_glamor.c
+@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
+
+
+ static Bool
+-radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
++radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
+ void **handle_p)
+ {
+ ScreenPtr screen = pixmap->drawable.pScreen;
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index b3db7c41..62962d61 100644
+--- a/src/radeon_kms.c
++++ b/src/radeon_kms.c
+@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+ if (dirty->rotation != RR_Rotate_0) {
+ dstregion = transform_region(damageregion,
+ &dirty->f_inverse,
+- dirty->slave_dst->drawable.width,
+- dirty->slave_dst->drawable.height);
++ dirty->secondary_dst->drawable.width,
++ dirty->secondary_dst->drawable.height);
+ } else
+ #endif
+ {
+@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
+
+ dstregion = RegionDuplicate(damageregion);
+ RegionTranslate(dstregion, -dirty->x, -dirty->y);
+- PixmapRegionInit(&pixregion, dirty->slave_dst);
++ PixmapRegionInit(&pixregion, dirty->secondary_dst);
+ RegionIntersect(dstregion, dstregion, &pixregion);
+ RegionUninit(&pixregion);
+ }
+@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
+ if (RegionNil(region))
+ goto out;
+
+- if (dirty->slave_dst->master_pixmap)
+- DamageRegionAppend(&dirty->slave_dst->drawable, region);
++ if (dirty->secondary_dst->primary_pixmap)
++ DamageRegionAppend(&dirty->secondary_dst->drawable, region);
+
+ #ifdef HAS_DIRTYTRACKING_ROTATION
+ PixmapSyncDirtyHelper(dirty);
+@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
+ #endif
+
+ radeon_cs_flush_indirect(src_scrn);
+- if (dirty->slave_dst->master_pixmap)
+- DamageRegionProcessPending(&dirty->slave_dst->drawable);
++ if (dirty->secondary_dst->primary_pixmap)
++ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
+
+ out:
+ DamageEmpty(dirty->damage);
+@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
+ void
+ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr master_screen = radeon_dirty_master(dirty);
++ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+ PixmapDirtyUpdatePtr ent;
+ RegionPtr region;
+
+- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
+- if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
++ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
++ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
+ continue;
+
+ region = dirty_region(ent);
+@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ #if HAS_SYNC_SHARED_PIXMAP
+
+ static Bool
+-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr master_screen = radeon_dirty_master(dirty);
++ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+
+- return !!master_screen->SyncSharedPixmap;
++ return !!primary_screen->SyncSharedPixmap;
+ }
+
+ static Bool
+-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
++ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
+
+- return !!slave_screen->SyncSharedPixmap;
++ return !!secondary_screen->SyncSharedPixmap;
+ }
+
+ static void
+ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr master_screen = radeon_dirty_master(dirty);
++ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
+
+- master_screen->SyncSharedPixmap(dirty);
++ primary_screen->SyncSharedPixmap(dirty);
+ }
+
+ #else /* !HAS_SYNC_SHARED_PIXMAP */
+
+ static Bool
+-master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
++ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
+
+- return master_scrn->driverName == scrn->driverName;
++ return primary_scrn->driverName == scrn->driverName;
+ }
+
+ static Bool
+-slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
++secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
+ {
+- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
++ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
+
+- return slave_scrn->driverName == scrn->driverName;
++ return secondary_scrn->driverName == scrn->driverName;
+ }
+
+ static void
+@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
+ static xf86CrtcPtr
+ radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ int c;
+
+- /* Find the CRTC which is scanning out from this slave pixmap */
++ /* Find the CRTC which is scanning out from this secondary pixmap */
+ for (c = 0; c < xf86_config->num_crtc; c++) {
+ xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
+ drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
+@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
+ if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
+ RegionPtr region;
+
+- if (master_has_sync_shared_pixmap(scrn, dirty))
++ if (primary_has_sync_shared_pixmap(scrn, dirty))
+ call_sync_shared_pixmap(dirty);
+
+ region = dirty_region(dirty);
+@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
+ radeon_cs_flush_indirect(scrn);
+ RegionCopy(&drmmode_crtc->scanout_last_region, region);
+ RegionTranslate(region, -crtc->x, -crtc->y);
+- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
++ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
+ }
+
+ redisplay_dirty(dirty, region);
+@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
+ static void
+ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
+ {
+- ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
++ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+ xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
+@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
+ static void
+ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
+ {
+- ScreenPtr screen = ent->slave_dst->drawable.pScreen;
++ ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
+ xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
+@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ if (screen->isGPU) {
+ PixmapDirtyUpdatePtr region_ent = ent;
+
+- if (master_has_sync_shared_pixmap(scrn, ent)) {
+- ScreenPtr master_screen = radeon_dirty_master(ent);
++ if (primary_has_sync_shared_pixmap(scrn, ent)) {
++ ScreenPtr primary_screen = radeon_dirty_primary(ent);
+
+- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
+- if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
++ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
++ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
+ break;
+ }
+ }
+@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+
+ RegionDestroy(region);
+ } else {
+- if (slave_has_sync_shared_pixmap(scrn, ent))
++ if (secondary_has_sync_shared_pixmap(scrn, ent))
+ continue;
+
+ region = dirty_region(ent);
+@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
+ pScreen->BlockHandler = RADEONBlockHandler_KMS;
+
+- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
++ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
+ return;
+
+ if (!pScreen->isGPU)
+@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ int c;
+
+- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
++ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
+ return 0;
+
+ /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
+--
+cgit v1.2.1
+
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
new file mode 100644
index 000000000000..37f523607eb2
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DRI=always
+inherit linux-info xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+ SRC_URI=""
+else
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="ATI video driver"
+HOMEPAGE="https://www.x.org/wiki/ati/"
+
+IUSE="udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
+ >=x11-libs/libpciaccess-0.8.0
+ x11-base/xorg-server[-minimal]
+ udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
+ "${FILESDIR}"/${P}-xserver-21-build-fixes.patch
+)
+
+pkg_pretend() {
+ if use kernel_linux; then
+ if kernel_is -ge 3 9; then
+ CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
+ else
+ CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+ fi
+ fi
+ check_extra_config
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ xorg-3_pkg_setup
+}
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ --enable-glamor
+ $(use_enable udev)
+ )
+ xorg-3_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-ati/files/, x11-drivers/xf86-video-ati/
@ 2023-06-05 15:40 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2023-06-05 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 4456d8b95a4d1368ef9ff7dcf4f590fd0102fbf6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 5 15:29:32 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 15:39:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4456d8b9
x11-drivers/xf86-video-ati: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-drivers/xf86-video-ati/Manifest | 1 -
...o-ati-19.1.0-Fix-link-failure-with-gcc-10.patch | 33 --
...6-video-ati-19.1.0-xserver-21-build-fixes.patch | 368 ---------------------
.../xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild | 54 ---
4 files changed, 456 deletions(-)
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index fdc31070afe6..964eb1c1da71 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,2 +1 @@
-DIST xf86-video-ati-19.1.0.tar.bz2 904558 BLAKE2B 424e8b3c6fa14fa4f0bc00940bdf1008400f25ce7103b13ecefdbda9e629239c5ab011952d19c305251e9c0008650da3db0eb91055d5585e2b1c3dd108a74d86 SHA512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
DIST xf86-video-ati-22.0.0.tar.xz 755812 BLAKE2B 97349eca2b01e714a44bcfc9489251d175eab2ca622ac5f475797d0d862e082cf9f2bc49d996bc4a8ef39d13f4474953542bd5c5cfa495877b280aff218e4fe2 SHA512 fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
deleted file mode 100644
index e0375b0826c7..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-Fix-link-failure-with-gcc-10.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f223035f4ffcff2a9296d1e907a5193f8e8845a3 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 4 Feb 2020 16:38:06 -0500
-Subject: [PATCH] Fix link failure with gcc 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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.
-
-Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
----
- 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 96eaef0a..8cd8a0a6 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
---
-2.26.2
-
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
deleted file mode 100644
index 6666e0af6916..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-19.1.0-xserver-21-build-fixes.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 13 Jul 2020 09:11:28 +1000
-Subject: ati: cleanup terminology to use primary/secondary
-
-The X server changed some API/ABIs here.
-
-Based on amdgpu patch by Michel
----
- man/radeon.man | 2 +-
- src/compat-api.h | 6 +++++
- src/drmmode_display.c | 4 +--
- src/evergreen_state.h | 2 +-
- src/r600_state.h | 2 +-
- src/radeon.h | 10 +++----
- src/radeon_exa.c | 2 +-
- src/radeon_glamor.c | 2 +-
- src/radeon_kms.c | 74 +++++++++++++++++++++++++--------------------------
- 9 files changed, 55 insertions(+), 49 deletions(-)
-
-diff --git a/man/radeon.man b/man/radeon.man
-index dcebf537..247dcdb7 100644
---- a/man/radeon.man
-+++ b/man/radeon.man
-@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
- accordingly. If this option isn't set, the default value of the property is
- .B auto,
- which means that TearFree is on for rotated outputs, outputs with RandR
--transforms applied and for RandR 1.4 slave outputs, otherwise off.
-+transforms applied and for RandR 1.4 secondary outputs, otherwise off.
- .TP
- .BI "Option \*qAccelMethod\*q \*q" "string" \*q
- Chooses between available acceleration architectures. Valid values are
-diff --git a/src/compat-api.h b/src/compat-api.h
-index f4e7524f..def6d3e4 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -34,4 +34,10 @@
- #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
- #endif
-
-+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-+#define current_primary current_master
-+#define primary_pixmap master_pixmap
-+#define secondary_dst slave_dst
-+#endif
-+
- #endif
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 72f96a0c..3099a729 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
- xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
- ent) {
- if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
-- dirty->slave_dst =
-+ dirty->secondary_dst =
- drmmode_crtc->scanout[scanout_id].pixmap;
- break;
- }
-@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
-
- xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
- if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
-- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
-+ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
- break;
- }
- }
-diff --git a/src/evergreen_state.h b/src/evergreen_state.h
-index 7e54e1c7..34ba87b6 100644
---- a/src/evergreen_state.h
-+++ b/src/evergreen_state.h
-@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- int *new_pitch);
- extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
- extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
--extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
-+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
- extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
-
- #endif
-diff --git a/src/r600_state.h b/src/r600_state.h
-index 34345996..567c3ca2 100644
---- a/src/r600_state.h
-+++ b/src/r600_state.h
-@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- int *new_pitch);
- extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
- extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
--extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
-+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
- extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
- #endif
-diff --git a/src/radeon.h b/src/radeon.h
-index e4a2ba66..68d7756a 100644
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -182,18 +182,18 @@ typedef enum {
-
-
- static inline ScreenPtr
--radeon_master_screen(ScreenPtr screen)
-+radeon_primary_screen(ScreenPtr screen)
- {
-- if (screen->current_master)
-- return screen->current_master;
-+ if (screen->current_primary)
-+ return screen->current_primary;
-
- return screen;
- }
-
- static inline ScreenPtr
--radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
-+radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
- {
-- return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
-+ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
- }
-
- static inline DrawablePtr
-diff --git a/src/radeon_exa.c b/src/radeon_exa.c
-index 268155ed..320ff992 100644
---- a/src/radeon_exa.c
-+++ b/src/radeon_exa.c
-@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
- free(driverPriv);
- }
-
--Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
-+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
- {
- struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
-
-diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
-index f1098381..ccf99941 100644
---- a/src/radeon_glamor.c
-+++ b/src/radeon_glamor.c
-@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
-
-
- static Bool
--radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
-+radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
- void **handle_p)
- {
- ScreenPtr screen = pixmap->drawable.pScreen;
-diff --git a/src/radeon_kms.c b/src/radeon_kms.c
-index b3db7c41..62962d61 100644
---- a/src/radeon_kms.c
-+++ b/src/radeon_kms.c
-@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
- if (dirty->rotation != RR_Rotate_0) {
- dstregion = transform_region(damageregion,
- &dirty->f_inverse,
-- dirty->slave_dst->drawable.width,
-- dirty->slave_dst->drawable.height);
-+ dirty->secondary_dst->drawable.width,
-+ dirty->secondary_dst->drawable.height);
- } else
- #endif
- {
-@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
-
- dstregion = RegionDuplicate(damageregion);
- RegionTranslate(dstregion, -dirty->x, -dirty->y);
-- PixmapRegionInit(&pixregion, dirty->slave_dst);
-+ PixmapRegionInit(&pixregion, dirty->secondary_dst);
- RegionIntersect(dstregion, dstregion, &pixregion);
- RegionUninit(&pixregion);
- }
-@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
- if (RegionNil(region))
- goto out;
-
-- if (dirty->slave_dst->master_pixmap)
-- DamageRegionAppend(&dirty->slave_dst->drawable, region);
-+ if (dirty->secondary_dst->primary_pixmap)
-+ DamageRegionAppend(&dirty->secondary_dst->drawable, region);
-
- #ifdef HAS_DIRTYTRACKING_ROTATION
- PixmapSyncDirtyHelper(dirty);
-@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
- #endif
-
- radeon_cs_flush_indirect(src_scrn);
-- if (dirty->slave_dst->master_pixmap)
-- DamageRegionProcessPending(&dirty->slave_dst->drawable);
-+ if (dirty->secondary_dst->primary_pixmap)
-+ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
-
- out:
- DamageEmpty(dirty->damage);
-@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
- void
- radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr master_screen = radeon_dirty_master(dirty);
-+ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
- PixmapDirtyUpdatePtr ent;
- RegionPtr region;
-
-- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
-- if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
-+ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
-+ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
- continue;
-
- region = dirty_region(ent);
-@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- #if HAS_SYNC_SHARED_PIXMAP
-
- static Bool
--master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr master_screen = radeon_dirty_master(dirty);
-+ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
-
-- return !!master_screen->SyncSharedPixmap;
-+ return !!primary_screen->SyncSharedPixmap;
- }
-
- static Bool
--slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
-+ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
-
-- return !!slave_screen->SyncSharedPixmap;
-+ return !!secondary_screen->SyncSharedPixmap;
- }
-
- static void
- call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr master_screen = radeon_dirty_master(dirty);
-+ ScreenPtr primary_screen = radeon_dirty_primary(dirty);
-
-- master_screen->SyncSharedPixmap(dirty);
-+ primary_screen->SyncSharedPixmap(dirty);
- }
-
- #else /* !HAS_SYNC_SHARED_PIXMAP */
-
- static Bool
--master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
-- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
-+ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
-
-- return master_scrn->driverName == scrn->driverName;
-+ return primary_scrn->driverName == scrn->driverName;
- }
-
- static Bool
--slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
-+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
- {
-- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
-+ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
-
-- return slave_scrn->driverName == scrn->driverName;
-+ return secondary_scrn->driverName == scrn->driverName;
- }
-
- static void
-@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
- static xf86CrtcPtr
- radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
-+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- int c;
-
-- /* Find the CRTC which is scanning out from this slave pixmap */
-+ /* Find the CRTC which is scanning out from this secondary pixmap */
- for (c = 0; c < xf86_config->num_crtc; c++) {
- xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
- drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
-@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
- if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
- RegionPtr region;
-
-- if (master_has_sync_shared_pixmap(scrn, dirty))
-+ if (primary_has_sync_shared_pixmap(scrn, dirty))
- call_sync_shared_pixmap(dirty);
-
- region = dirty_region(dirty);
-@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
- radeon_cs_flush_indirect(scrn);
- RegionCopy(&drmmode_crtc->scanout_last_region, region);
- RegionTranslate(region, -crtc->x, -crtc->y);
-- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
-+ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
- }
-
- redisplay_dirty(dirty, region);
-@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
- static void
- radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
- {
-- ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
-+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
- xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
-@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
- static void
- radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
- {
-- ScreenPtr screen = ent->slave_dst->drawable.pScreen;
-+ ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
- xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
-@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
- if (screen->isGPU) {
- PixmapDirtyUpdatePtr region_ent = ent;
-
-- if (master_has_sync_shared_pixmap(scrn, ent)) {
-- ScreenPtr master_screen = radeon_dirty_master(ent);
-+ if (primary_has_sync_shared_pixmap(scrn, ent)) {
-+ ScreenPtr primary_screen = radeon_dirty_primary(ent);
-
-- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
-- if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
-+ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
-+ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
- break;
- }
- }
-@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
-
- RegionDestroy(region);
- } else {
-- if (slave_has_sync_shared_pixmap(scrn, ent))
-+ if (secondary_has_sync_shared_pixmap(scrn, ent))
- continue;
-
- region = dirty_region(ent);
-@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
- (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
- pScreen->BlockHandler = RADEONBlockHandler_KMS;
-
-- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
-+ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
- return;
-
- if (!pScreen->isGPU)
-@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- int c;
-
-- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
-+ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
- return 0;
-
- /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
---
-cgit v1.2.1
-
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
deleted file mode 100644
index 07a7e42694b1..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DRI=always
-inherit linux-info xorg-3
-
-if [[ ${PV} == 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-fi
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-IUSE="udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_radeon]
- >=x11-libs/libpciaccess-0.8.0
- x11-base/xorg-server[-minimal]
- udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Fix-link-failure-with-gcc-10.patch
- "${FILESDIR}"/${P}-xserver-21-build-fixes.patch
-)
-
-pkg_pretend() {
- if use kernel_linux; then
- if kernel_is -ge 3 9; then
- CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
- else
- CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
- fi
- fi
- check_extra_config
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- xorg-3_pkg_setup
-}
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- --enable-glamor
- $(use_enable udev)
- )
- xorg-3_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-05 15:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-01 18:54 [gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-video-ati/files/, x11-drivers/xf86-video-ati/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2021-11-30 22:23 Piotr Karbowski
2023-06-05 15:40 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox