commit e7f155cff08b31ff36c2893a19c5e8fbe291f716
Author: Danny Rawlins <contact(a)romster.me>
Date: Tue Nov 2 00:15:11 2021 +1100
[notify] xorg-xf86-video-ati: fix ABI for new xorg-server
diff --git a/xorg-xf86-video-ati/.signature b/xorg-xf86-video-ati/.signature
index eb5a4d37..2330c82c 100644
--- a/xorg-xf86-video-ati/.signature
+++ b/xorg-xf86-video-ati/.signature
@@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndDURWlYHlh+b8WPJGqX1SErGjfrJbTpfcHYVzDmdsRk3qSCN56a8OhH0fyU1B5kGOAidbeXIT6cfvk/uB1D6FA4=
-SHA256 (Pkgfile) = fbe37ad446969ff1f62017f8fa242a5c5a2a9617aafb000dce54de6987a679bb
+RWTSGWF5Q7TndH/ra8fw/Db11px9G0LwTTmFk89VFYWVDNch43BVk9YyrF7tfiKkhU8HVUw3cMzrOwDOHUxImO0s839uXzQ05Ag=
+SHA256 (Pkgfile) = 501cff8286dee0a322e32a56b7d055a94b6e3e2f0f57d6658b482af4c7446f70
SHA256 (.footprint) = d642b90858126478a42ee1b9fd9730e51d6ef1852765c75c7ec6985fbbbcae0a
SHA256 (xf86-video-ati-19.1.0.tar.bz2) = 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49
+SHA256 (xorg-abi.patch) = 05c83497fe828ec5485585c10aa65eb00fe4016fbc3a5caeb71f29a8e0ea16c3
diff --git a/xorg-xf86-video-ati/Pkgfile b/xorg-xf86-video-ati/Pkgfile
index a54099c6..4a326b99 100644
--- a/xorg-xf86-video-ati/Pkgfile
+++ b/xorg-xf86-video-ati/Pkgfile
@@ -5,12 +5,15 @@
name=xorg-xf86-video-ati
version=19.1.0
-release=2
-source=(https://www.x.org/archive/individual/driver/xf86-video-ati-$version.tar.bz2)
+release=3
+source=(https://www.x.org/archive/individual/driver/xf86-video-ati-$version.tar.bz2
+ xorg-abi.patch)
build() {
cd xf86-video-ati-$version
+ patch -p1 -i $SRC/xorg-abi.patch
+
./configure --prefix=/usr
make CFLAGS="$CFLAGS -fcommon"
diff --git a/xorg-xf86-video-ati/xorg-abi.patch b/xorg-xf86-video-ati/xorg-abi.patch
new file mode 100644
index 00000000..c48e73df
--- /dev/null
+++ b/xorg-xf86-video-ati/xorg-abi.patch
@@ -0,0 +1,345 @@
+diff --git a/man/radeon.man b/man/radeon.man
+index dcebf53754891c378f6bee8287e0834207efbbf0..247dcdb7d4ff790b4cf9024efec99add80df65e5 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 f4e7524f0055fd438b85b37ed284f6596a04468c..def6d3e4dd16ba71aed053a304966e4a5675aec4 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 72f96a0ccab1f556b21b3ff093d0e3e4b2253df6..3099a729b3f4f4559b6c4f89b60b4946decce8ea 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 7e54e1c7f2c1b564e3ebbb5c820a8ca7eb547a53..34ba87b6ce81c9aa9c0c5787996d2873783a6ce6 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 3434599674a27f124d20cb95d4b90a79bca98755..567c3ca22f3d6b7a6e65548291f7fabd2ad121d8 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 e4a2ba66fe1331af38b0a10459f8d0cccb32316a..68d7756a02132f54b4ddb976a4dd31409c11c5d1 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 268155ed7f91255b119abb752e9681a3143e0c43..320ff9927b05437db7f9a79d91b1b2c73912b08e 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 f1098381ea0c5ea8066e1d2ab88ed8fdbacaebc5..ccf9994188e35e1072c4ebc2f383ad8d8898aa74 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 b3db7c41341dc3293e08a24f371d80ffb4001bd1..62962d61d8ee22a02567b7125b4bb3a7f7230be4 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
