summaryrefslogtreecommitdiff
path: root/extra/xf86-video-nouveau
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xf86-video-nouveau')
-rw-r--r--extra/xf86-video-nouveau/xorg-server-21.1.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/extra/xf86-video-nouveau/xorg-server-21.1.patch b/extra/xf86-video-nouveau/xorg-server-21.1.patch
deleted file mode 100644
index 03d0b80..0000000
--- a/extra/xf86-video-nouveau/xorg-server-21.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/compat-api.h b/src/compat-api.h
-index fde2f4b1cfde75875c07bfe13524dc6ba2661382..8a1fcf9be1c5d1ceb48a50f2ed533d93ec7ff4c7 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -102,4 +102,8 @@
-
- #endif
-
-+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-+#define secondary_dst slave_dst
-+#endif
-+
- #endif
-diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
-index 55df6f8f11c9e14b1891e5c841faef10c17f0a35..db3b112a2db70f8e902e54aa3af99e51e7d0c6f7 100644
---- a/src/nouveau_exa.c
-+++ b/src/nouveau_exa.c
-@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
-
- #ifdef NOUVEAU_PIXMAP_SHARING
- static Bool
--nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)
-+nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
- {
- struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
- struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index e72a6b65a81119f12f3608295a4547762a866ad7..f9ab4af19361d99d74f580d1ff3f28d49843e8b0 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
- {
- RegionRec pixregion;
-
-- PixmapRegionInit(&pixregion, dirty->slave_dst);
-+ PixmapRegionInit(&pixregion, dirty->secondary_dst);
-
-- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
-+ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
- #ifdef HAS_DIRTYTRACKING_ROTATION
- PixmapSyncDirtyHelper(dirty);
- #else
- PixmapSyncDirtyHelper(dirty, &pixregion);
- #endif
-
-- DamageRegionProcessPending(&dirty->slave_dst->drawable);
-+ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
- RegionUninit(&pixregion);
- }
-