1*4882a593SmuzhiyunFrom e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Dave Airlie <airlied@redhat.com> 3*4882a593SmuzhiyunDate: Mon, 13 Jul 2020 09:20:15 +1000 4*4882a593SmuzhiyunSubject: [PATCH] nouveau: fixup driver for new X server ABI 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDownloaded from upstream commit 7*4882a593Smuzhiyunhttps://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun src/compat-api.h | 4 ++++ 12*4882a593Smuzhiyun src/nouveau_exa.c | 2 +- 13*4882a593Smuzhiyun src/nv_driver.c | 6 +++--- 14*4882a593Smuzhiyun 3 files changed, 8 insertions(+), 4 deletions(-) 15*4882a593Smuzhiyun 16*4882a593Smuzhiyundiff --git a/src/compat-api.h b/src/compat-api.h 17*4882a593Smuzhiyunindex fde2f4b..8a1fcf9 100644 18*4882a593Smuzhiyun--- a/src/compat-api.h 19*4882a593Smuzhiyun+++ b/src/compat-api.h 20*4882a593Smuzhiyun@@ -102,4 +102,8 @@ 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun #endif 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) 25*4882a593Smuzhiyun+#define secondary_dst slave_dst 26*4882a593Smuzhiyun+#endif 27*4882a593Smuzhiyun+ 28*4882a593Smuzhiyun #endif 29*4882a593Smuzhiyundiff --git a/src/nouveau_exa.c b/src/nouveau_exa.c 30*4882a593Smuzhiyunindex 55df6f8..db3b112 100644 31*4882a593Smuzhiyun--- a/src/nouveau_exa.c 32*4882a593Smuzhiyun+++ b/src/nouveau_exa.c 33*4882a593Smuzhiyun@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun #ifdef NOUVEAU_PIXMAP_SHARING 36*4882a593Smuzhiyun static Bool 37*4882a593Smuzhiyun-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) 38*4882a593Smuzhiyun+nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) 39*4882a593Smuzhiyun { 40*4882a593Smuzhiyun struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); 41*4882a593Smuzhiyun struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); 42*4882a593Smuzhiyundiff --git a/src/nv_driver.c b/src/nv_driver.c 43*4882a593Smuzhiyunindex e72a6b6..f9ab4af 100644 44*4882a593Smuzhiyun--- a/src/nv_driver.c 45*4882a593Smuzhiyun+++ b/src/nv_driver.c 46*4882a593Smuzhiyun@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) 47*4882a593Smuzhiyun { 48*4882a593Smuzhiyun RegionRec pixregion; 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun- PixmapRegionInit(&pixregion, dirty->slave_dst); 51*4882a593Smuzhiyun+ PixmapRegionInit(&pixregion, dirty->secondary_dst); 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); 54*4882a593Smuzhiyun+ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); 55*4882a593Smuzhiyun #ifdef HAS_DIRTYTRACKING_ROTATION 56*4882a593Smuzhiyun PixmapSyncDirtyHelper(dirty); 57*4882a593Smuzhiyun #else 58*4882a593Smuzhiyun PixmapSyncDirtyHelper(dirty, &pixregion); 59*4882a593Smuzhiyun #endif 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun- DamageRegionProcessPending(&dirty->slave_dst->drawable); 62*4882a593Smuzhiyun+ DamageRegionProcessPending(&dirty->secondary_dst->drawable); 63*4882a593Smuzhiyun RegionUninit(&pixregion); 64*4882a593Smuzhiyun } 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun-- 67*4882a593SmuzhiyunGitLab 68*4882a593Smuzhiyun 69