From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 13 Jul 2020 09:20:15 +1000
Subject: [PATCH] nouveau: fixup driver for new X server ABI

---
 src/compat-api.h  | 4 ++++
 src/nouveau_exa.c | 2 +-
 src/nv_driver.c   | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/compat-api.h b/src/compat-api.h
index fde2f4b..8a1fcf9 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 55df6f8..db3b112 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 e72a6b6..f9ab4af 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);
 }
 
-- 
2.33.1

ize='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>root</a>/<a href='/guix/log/gnu?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>gnu</a>/<a href='/guix/log/gnu/packages?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>packages</a>/<a href='/guix/log/gnu/packages/plan9.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>plan9.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/plan9.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-01-07 10:39:50 +0800'>2024-01-07</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=25bcf4eda05b501758b11a53823867dc500ac7d1'>plan9port: Update to 0.1.0-1.f8681ac.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2024-01-07 10:39:45 +0800'>2024-01-07</span></td><td><a href='/guix/commit/gnu/packages/plan9.scm?id=2538a773c53e0f7fce4de0c49b6ec1d41acc25c0'>plan9port: Install into "$output/plan9" instead of "$output".</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>