1*595f6308SAndrew GeisslerFrom 7ae2f6ba4cbf29fc3f1b08579b838679a3301cb3 Mon Sep 17 00:00:00 2001 2*595f6308SAndrew GeisslerFrom: Dave Airlie <airlied@redhat.com> 3*595f6308SAndrew GeisslerDate: Mon, 13 Jul 2020 09:20:15 +1000 4*595f6308SAndrew GeisslerSubject: [PATCH] nouveau: fixup driver for new X server ABI 5*595f6308SAndrew Geissler 6*595f6308SAndrew GeisslerUpstream-Status: Backport [https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/commit/?id=e80e73ced69b15662103d0fd6837db4ce6c6eb5b] 7*595f6308SAndrew GeisslerSigned-off-by: Khem Raj <raj.khem@gmail.com> 8*595f6308SAndrew Geissler--- 9*595f6308SAndrew Geissler src/compat-api.h | 4 ++++ 10*595f6308SAndrew Geissler src/nouveau_exa.c | 2 +- 11*595f6308SAndrew Geissler src/nv_driver.c | 6 +++--- 12*595f6308SAndrew Geissler 3 files changed, 8 insertions(+), 4 deletions(-) 13*595f6308SAndrew Geissler 14*595f6308SAndrew Geisslerdiff --git a/src/compat-api.h b/src/compat-api.h 15*595f6308SAndrew Geisslerindex fde2f4b..8a1fcf9 100644 16*595f6308SAndrew Geissler--- a/src/compat-api.h 17*595f6308SAndrew Geissler+++ b/src/compat-api.h 18*595f6308SAndrew Geissler@@ -102,4 +102,8 @@ 19*595f6308SAndrew Geissler 20*595f6308SAndrew Geissler #endif 21*595f6308SAndrew Geissler 22*595f6308SAndrew Geissler+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 23*595f6308SAndrew Geissler+#define secondary_dst slave_dst 24*595f6308SAndrew Geissler+#endif 25*595f6308SAndrew Geissler+ 26*595f6308SAndrew Geissler #endif 27*595f6308SAndrew Geisslerdiff --git a/src/nouveau_exa.c b/src/nouveau_exa.c 28*595f6308SAndrew Geisslerindex 55df6f8..db3b112 100644 29*595f6308SAndrew Geissler--- a/src/nouveau_exa.c 30*595f6308SAndrew Geissler+++ b/src/nouveau_exa.c 31*595f6308SAndrew Geissler@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) 32*595f6308SAndrew Geissler 33*595f6308SAndrew Geissler #ifdef NOUVEAU_PIXMAP_SHARING 34*595f6308SAndrew Geissler static Bool 35*595f6308SAndrew Geissler-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) 36*595f6308SAndrew Geissler+nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) 37*595f6308SAndrew Geissler { 38*595f6308SAndrew Geissler struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); 39*595f6308SAndrew Geissler struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); 40*595f6308SAndrew Geisslerdiff --git a/src/nv_driver.c b/src/nv_driver.c 41*595f6308SAndrew Geisslerindex e72a6b6..f9ab4af 100644 42*595f6308SAndrew Geissler--- a/src/nv_driver.c 43*595f6308SAndrew Geissler+++ b/src/nv_driver.c 44*595f6308SAndrew Geissler@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) 45*595f6308SAndrew Geissler { 46*595f6308SAndrew Geissler RegionRec pixregion; 47*595f6308SAndrew Geissler 48*595f6308SAndrew Geissler- PixmapRegionInit(&pixregion, dirty->slave_dst); 49*595f6308SAndrew Geissler+ PixmapRegionInit(&pixregion, dirty->secondary_dst); 50*595f6308SAndrew Geissler 51*595f6308SAndrew Geissler- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); 52*595f6308SAndrew Geissler+ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); 53*595f6308SAndrew Geissler #ifdef HAS_DIRTYTRACKING_ROTATION 54*595f6308SAndrew Geissler PixmapSyncDirtyHelper(dirty); 55*595f6308SAndrew Geissler #else 56*595f6308SAndrew Geissler PixmapSyncDirtyHelper(dirty, &pixregion); 57*595f6308SAndrew Geissler #endif 58*595f6308SAndrew Geissler 59*595f6308SAndrew Geissler- DamageRegionProcessPending(&dirty->slave_dst->drawable); 60*595f6308SAndrew Geissler+ DamageRegionProcessPending(&dirty->secondary_dst->drawable); 61*595f6308SAndrew Geissler RegionUninit(&pixregion); 62*595f6308SAndrew Geissler } 63*595f6308SAndrew Geissler 64*595f6308SAndrew Geissler-- 65*595f6308SAndrew Geissler2.33.1 66*595f6308SAndrew Geissler 67