[patch] nouveau_rename.patch

nouveau_rename.patch (text/plain), 1.71 KB, created by cyrillic on 2020-07-11 22:56:35 UTC

diff -urN a/src/nouveau_exa.c b/src/nouveau_exa.c
--- a/src/nouveau_exa.c	2019-01-28 23:41:58.000000000 -0500
+++ b/src/nouveau_exa.c	2020-07-11 14:18:07.782036253 -0400
@@ -157,7 +157,7 @@
 
 #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 -urN a/src/nv_driver.c b/src/nv_driver.c
--- a/src/nv_driver.c	2019-01-28 23:41:58.000000000 -0500
+++ b/src/nv_driver.c	2020-07-11 14:18:07.785036339 -0400
@@ -503,7 +503,7 @@
 	{
 		ret = drmSetMaster(pNv->dev->fd);
 		if (ret)
-			ErrorF("Unable to get master: %s\n", strerror(errno));
+			ErrorF("Unable to get primary: %s\n", strerror(errno));
 	}
 
 	if (XF86_CRTC_CONFIG_PTR(pScrn)->num_crtc && !xf86SetDesiredModes(pScrn))
@@ -541,7 +541,7 @@
 
 	ret = drmDropMaster(pNv->dev->fd);
 	if (ret && errno != EIO && errno != ENODEV)
-		ErrorF("Error dropping master: %i(%m)\n", -errno);
+		ErrorF("Error dropping primary: %i(%m)\n", -errno);
 }
 
 static void
@@ -559,16 +559,16 @@
 {
 	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);
 }