[patch] intel_rename.patch

intel_rename.patch (text/plain), 23.43 KB, created by cyrillic on 2020-07-11 22:55:50 UTC

diff -urN a/src/intel_device.c b/src/intel_device.c
--- a/src/intel_device.c	2020-07-11 18:06:08.770330872 -0400
+++ b/src/intel_device.c	2020-07-11 18:13:27.508732082 -0400
@@ -72,12 +72,12 @@
 
 struct intel_device {
 	int idx;
-	char *master_node;
+	char *primary_node;
 	char *render_node;
 	int fd;
 	int device_id;
 	int open_count;
-	int master_count;
+	int primary_count;
 };
 
 static int intel_device_key = -1;
@@ -454,9 +454,9 @@
 	return fd;
 }
 
-static char *find_master_node(int fd)
+static char *find_primary_node(int fd)
 {
-	struct stat st, master;
+	struct stat st, primary;
 	char buf[128];
 
 	if (fstat(fd, &st))
@@ -466,9 +466,9 @@
 		return NULL;
 
 	sprintf(buf, "/dev/dri/card%d", (int)(st.st_rdev & 0x7f));
-	if (stat(buf, &master) == 0 &&
-	    S_ISCHR(master.st_mode) &&
-	    (st.st_rdev & 0x7f) == master.st_rdev)
+	if (stat(buf, &primary) == 0 &&
+	    S_ISCHR(primary.st_mode) &&
+	    (st.st_rdev & 0x7f) == primary.st_rdev)
 		return strdup(buf);
 
 	/* Fallback to iterating over the usual suspects */
@@ -488,18 +488,18 @@
 
 static char *find_render_node(int fd)
 {
-	struct stat master, render;
+	struct stat primary, render;
 	char buf[128];
 	int i;
 
 	/* Are we a render-node ourselves? */
-	if (is_render_node(fd, &master))
+	if (is_render_node(fd, &primary))
 		return NULL;
 
-	sprintf(buf, "/dev/dri/renderD%d", (int)((master.st_rdev | 0x80) & 0xbf));
+	sprintf(buf, "/dev/dri/renderD%d", (int)((primary.st_rdev | 0x80) & 0xbf));
 	if (stat(buf, &render) == 0 &&
 	    S_ISCHR(render.st_mode) &&
-	    render.st_rdev == (master.st_rdev | 0x80))
+	    render.st_rdev == (primary.st_rdev | 0x80))
 		return strdup(buf);
 
 	/* Misaligned card <-> renderD, do a full search */
@@ -507,7 +507,7 @@
 		sprintf(buf, "/dev/dri/renderD%d", i + 128);
 		if (stat(buf, &render) == 0 &&
 		    S_ISCHR(render.st_mode) &&
-		    render.st_rdev == (master.st_rdev | 0x80))
+		    render.st_rdev == (primary.st_rdev | 0x80))
 			return strdup(buf);
 	}
 
@@ -555,7 +555,7 @@
 }
 #endif
 
-static int is_master(int fd)
+static int is_primary(int fd)
 {
 	drmSetVersion sv;
 
@@ -573,7 +573,7 @@
 {
 	struct intel_device *dev;
 	char *path;
-	int fd, master_count;
+	int fd, primary_count;
 
 	if (intel_device_key == -1)
 		intel_device_key = xf86AllocateEntityPrivateIndex();
@@ -586,18 +586,18 @@
 
 	path = get_path(platform);
 
-	master_count = 1; /* DRM_MASTER is managed by Xserver */
+	primary_count = 1; /* DRM_MASTER is managed by Xserver */
 	fd = get_fd(platform);
 	if (fd == -1) {
 		fd = __intel_open_device(pci, path);
 		if (fd == -1)
 			goto err_path;
 
-		master_count = 0;
+		primary_count = 0;
 	}
 
 	if (path == NULL) {
-		path = find_master_node(fd);
+		path = find_primary_node(fd);
 		if (path == NULL)
 			goto err_close;
 	}
@@ -609,13 +609,13 @@
 	if (dev == NULL)
 		goto err_close;
 
-	/* If hosted under a system compositor, just pretend to be master */
+	/* If hosted under a system compositor, just pretend to be primary */
 	if (hosted())
-		master_count++;
+		primary_count++;
 
 	/* Non-root user holding MASTER, don't let go */
-	if (geteuid() && is_master(fd))
-		master_count++;
+	if (geteuid() && is_primary(fd))
+		primary_count++;
 
 	if (pci)
 		dev->device_id = pci->device_id;
@@ -624,19 +624,19 @@
 
 	dev->idx = entity_num;
 	dev->fd = fd;
-	dev->open_count = master_count;
-	dev->master_count = master_count;
-	dev->master_node = path;
+	dev->open_count = primary_count;
+	dev->primary_count = primary_count;
+	dev->primary_node = path;
 	dev->render_node = find_render_node(fd);
 	if (dev->render_node == NULL)
-		dev->render_node = dev->master_node;
+		dev->render_node = dev->primary_node;
 
 	xf86GetEntityPrivate(entity_num, intel_device_key)->ptr = dev;
 
 	return fd;
 
 err_close:
-	if (master_count == 0) /* Don't close server-fds */
+	if (primary_count == 0) /* Don't close server-fds */
 		close(fd);
 err_path:
 	free(path);
@@ -655,12 +655,12 @@
 	if (!dev)
 		return;
 
-	if (dev->master_count == 0) /* Don't close server-fds */
+	if (dev->primary_count == 0) /* Don't close server-fds */
 		close(dev->fd);
 
-	if (dev->render_node != dev->master_node)
+	if (dev->render_node != dev->primary_node)
 		free(dev->render_node);
-	free(dev->master_node);
+	free(dev->primary_node);
 	free(dev);
 }
 
@@ -699,8 +699,8 @@
 
 		assert(!hosted());
 
-		/* Check that what we opened was a master or a
-		 * master-capable FD, by setting the version of the
+		/* Check that what we opened was a primary or a
+		 * primary-capable FD, by setting the version of the
 		 * interface we'll use to talk to it.
 		 */
 		do {
@@ -728,10 +728,10 @@
 	return dev;
 }
 
-const char *intel_get_master_name(struct intel_device *dev)
+const char *intel_get_primary_name(struct intel_device *dev)
 {
-	assert(dev && dev->master_node);
-	return dev->master_node;
+	assert(dev && dev->primary_node);
+	return dev->primary_node;
 }
 
 const char *intel_get_client_name(struct intel_device *dev)
@@ -782,14 +782,14 @@
 	return dev->device_id;
 }
 
-int intel_get_master(struct intel_device *dev)
+int intel_get_primary(struct intel_device *dev)
 {
 	int ret;
 
 	assert(dev && dev->fd != -1);
 
 	ret = 0;
-	if (dev->master_count++ == 0) {
+	if (dev->primary_count++ == 0) {
 		int retry = 2000;
 
 		assert(!hosted());
@@ -804,15 +804,15 @@
 	return ret;
 }
 
-int intel_put_master(struct intel_device *dev)
+int intel_put_primary(struct intel_device *dev)
 {
 	int ret;
 
 	assert(dev && dev->fd != -1);
 
 	ret = 0;
-	assert(dev->master_count);
-	if (--dev->master_count == 0) {
+	assert(dev->primary_count);
+	if (--dev->primary_count == 0) {
 		assert(!hosted());
 		assert(drmSetMaster(dev->fd) == 0);
 		ret = drmDropMaster(dev->fd);
@@ -833,8 +833,8 @@
 	xf86GetEntityPrivate(dev->idx, intel_device_key)->ptr = NULL;
 
 	drmClose(dev->fd);
-	if (dev->render_node != dev->master_node)
+	if (dev->render_node != dev->primary_node)
 		free(dev->render_node);
-	free(dev->master_node);
+	free(dev->primary_node);
 	free(dev);
 }
diff -urN a/src/intel_driver.h b/src/intel_driver.h
--- a/src/intel_driver.h	2020-07-11 18:06:08.770330872 -0400
+++ b/src/intel_driver.h	2020-07-11 18:13:27.508732082 -0400
@@ -128,12 +128,12 @@
 int __intel_peek_fd(ScrnInfoPtr scrn);
 struct intel_device *intel_get_device(ScrnInfoPtr scrn, int *fd);
 int intel_has_render_node(struct intel_device *dev);
-const char *intel_get_master_name(struct intel_device *dev);
+const char *intel_get_primary_name(struct intel_device *dev);
 const char *intel_get_client_name(struct intel_device *dev);
 int intel_get_client_fd(struct intel_device *dev);
 int intel_get_device_id(struct intel_device *dev);
-int intel_get_master(struct intel_device *dev);
-int intel_put_master(struct intel_device *dev);
+int intel_get_primary(struct intel_device *dev);
+int intel_put_primary(struct intel_device *dev);
 void intel_put_device(struct intel_device *dev);
 
 void intel_detect_chipset(ScrnInfoPtr scrn, struct intel_device *dev);
diff -urN a/src/intel_module.c b/src/intel_module.c
--- a/src/intel_module.c	2020-07-11 18:06:08.771330872 -0400
+++ b/src/intel_module.c	2020-07-11 18:13:27.508732082 -0400
@@ -816,7 +816,7 @@
 	if (intel_open_device(entity_num, dev->pdev, dev) == -1)
 		return FALSE;
 
-	/* Allow ourselves to act as a slaved output if not primary */
+	/* Allow ourselves to act as a secondaryd output if not primary */
 	if (flags & PLATFORM_PROBE_GPU_SCREEN) {
 		flags &= ~PLATFORM_PROBE_GPU_SCREEN;
 		scrn_flags |= XF86_ALLOCATE_GPU_SCREEN;
diff -urN a/src/sna/sna_accel.c b/src/sna/sna_accel.c
--- a/src/sna/sna_accel.c	2020-07-11 18:06:08.800330895 -0400
+++ b/src/sna/sna_accel.c	2020-07-11 18:13:27.528734196 -0400
@@ -1108,7 +1108,7 @@
 
 #ifdef CREATE_PIXMAP_USAGE_SHARED
 static Bool
-sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
+sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, void **fd_handle)
 {
 	struct sna *sna = to_sna_from_pixmap(pixmap);
 	struct sna_pixmap *priv;
@@ -17519,7 +17519,7 @@
 	sna->timer_active &= ~(1<<id);
 }
 
-static bool has_offload_slaves(struct sna *sna)
+static bool has_offload_secondarys(struct sna *sna)
 {
 #if HAS_PIXMAP_SHARING
 	ScreenPtr screen = to_screen_from_sna(sna);
@@ -17560,8 +17560,8 @@
 {
 	struct sna_pixmap *scanout;
 
-	if (has_offload_slaves(sna)) {
-		DBG(("%s: has offload slaves\n", __FUNCTION__));
+	if (has_offload_secondarys(sna)) {
+		DBG(("%s: has offload secondarys\n", __FUNCTION__));
 		return true;
 	}
 
@@ -17588,14 +17588,14 @@
 
 static bool stop_flush(struct sna *sna, struct sna_pixmap *scanout)
 {
-	DBG(("%s: scanout=%d shadow?=%d, slaves?=%d, (cpu?=%d || gpu?=%d))\n",
+	DBG(("%s: scanout=%d shadow?=%d, secondarys?=%d, (cpu?=%d || gpu?=%d))\n",
 	     __FUNCTION__,
 	     scanout && scanout->gpu_bo ? scanout->gpu_bo->handle : 0,
-	     has_shadow(sna), has_offload_slaves(sna),
+	     has_shadow(sna), has_offload_secondarys(sna),
 	     scanout && scanout->cpu_damage != NULL,
 	     scanout && scanout->gpu_bo && scanout->gpu_bo->rq != NULL));
 
-	if (has_offload_slaves(sna))
+	if (has_offload_secondarys(sna))
 		return true;
 
 	if (has_shadow(sna))
@@ -17696,7 +17696,7 @@
 #else
 		src = dirty->src;
 #endif
-		dst = dirty->slave_dst->master_pixmap;
+		dst = dirty->secondary_dst->primary_pixmap;
 
 		region.extents.x1 = dirty->x;
 		region.extents.x2 = dirty->x + dst->drawable.width;
@@ -17704,7 +17704,7 @@
 		region.extents.y2 = dirty->y + dst->drawable.height;
 		region.data = NULL;
 
-		DBG(("%s: pushing damage ((%d, %d), (%d, %d))x%d to slave pixmap=%d, ((%d, %d), (%d, %d))\n", __FUNCTION__,
+		DBG(("%s: pushing damage ((%d, %d), (%d, %d))x%d to secondary pixmap=%d, ((%d, %d), (%d, %d))\n", __FUNCTION__,
 		     damage->extents.x1, damage->extents.y1,
 		     damage->extents.x2, damage->extents.y2,
 		     region_num_rects(damage),
@@ -17723,9 +17723,9 @@
 		dy += dirty->dst_y;
 #endif
 		RegionTranslate(&region, dx, dy);
-		DamageRegionAppend(&dirty->slave_dst->drawable, &region);
+		DamageRegionAppend(&dirty->secondary_dst->drawable, &region);
 
-		DBG(("%s: slave:  ((%d, %d), (%d, %d))x%d\n", __FUNCTION__,
+		DBG(("%s: secondary:  ((%d, %d), (%d, %d))x%d\n", __FUNCTION__,
 		     region.extents.x1, region.extents.y1,
 		     region.extents.x2, region.extents.y2,
 		     region_num_rects(&region)));
@@ -17790,17 +17790,17 @@
 						    box, n, COPY_LAST))
 				goto fallback;
 
-			/* Before signalling the slave via ProcessPending,
+			/* Before signalling the secondary via ProcessPending,
 			 * ensure not only the batch is submitted as the
-			 * slave may be using the Damage callback to perform
+			 * secondary may be using the Damage callback to perform
 			 * its copy, but also that the memory must be coherent
-			 * - we need to treat it as uncached for the PCI slave
+			 * - we need to treat it as uncached for the PCI secondary
 			 * will bypass LLC.
 			 */
 			kgem_bo_sync__gtt(&sna->kgem, __sna_pixmap_get_bo(dst));
 		}
 
-		DamageRegionProcessPending(&dirty->slave_dst->drawable);
+		DamageRegionProcessPending(&dirty->secondary_dst->drawable);
 skip:
 		RegionUninit(&region);
 		DamageEmpty(dirty->damage);
diff -urN a/src/sna/sna_display.c b/src/sna/sna_display.c
--- a/src/sna/sna_display.c	2020-07-11 18:06:08.802330896 -0400
+++ b/src/sna/sna_display.c	2020-07-11 18:13:27.531734513 -0400
@@ -195,8 +195,8 @@
 	uint32_t id;
 	xf86CrtcPtr base;
 	struct drm_mode_modeinfo kmode;
-	PixmapPtr slave_pixmap;
-	DamagePtr slave_damage;
+	PixmapPtr secondary_pixmap;
+	DamagePtr secondary_damage;
 	struct kgem_bo *bo, *shadow_bo, *client_bo, *cache_bo;
 	struct sna_cursor *cursor;
 	unsigned int last_cursor_size;
@@ -617,7 +617,7 @@
 
 	assert(bo->tiling != I915_TILING_Y || sna->kgem.can_scanout_y);
 	assert((bo->pitch & 63) == 0);
-	assert(scrn->vtSema); /* must be master */
+	assert(scrn->vtSema); /* must be primary */
 
 	VG_CLEAR(arg);
 	arg.width = width;
@@ -1604,7 +1604,7 @@
 	VG_CLEAR(arg);
 	arg.crtc_id = __sna_crtc_id(sna_crtc);
 	arg.fb_id = fb_id(sna_crtc->bo);
-	if (sna_crtc->transform || sna_crtc->slave_pixmap) {
+	if (sna_crtc->transform || sna_crtc->secondary_pixmap) {
 		arg.x = 0;
 		arg.y = 0;
 		sna_crtc->offset = 0;
@@ -2021,7 +2021,7 @@
 	sna->mode.shadow_dirty = false;
 }
 
-static void sna_crtc_slave_damage(DamagePtr damage, RegionPtr region, void *closure)
+static void sna_crtc_secondary_damage(DamagePtr damage, RegionPtr region, void *closure)
 {
 	struct sna_crtc *crtc = closure;
 	struct sna *sna = to_sna(crtc->base->scrn);
@@ -2033,7 +2033,7 @@
 	     region_num_rects(region),
 	     __sna_crtc_pipe(crtc), crtc->base->x, crtc->base->y));
 
-	assert(crtc->slave_damage == damage);
+	assert(crtc->secondary_damage == damage);
 	assert(sna->mode.shadow_damage);
 
 	RegionTranslate(region, crtc->base->x, crtc->base->y);
@@ -2058,22 +2058,22 @@
 		assert(sna->mode.shadow == NULL);
 	}
 
-	if (crtc->slave_pixmap) {
-		assert(crtc->slave_damage == NULL);
+	if (crtc->secondary_pixmap) {
+		assert(crtc->secondary_damage == NULL);
 
-		DBG(("%s: enabling PRIME slave tracking on CRTC %d [pipe=%d], pixmap=%ld\n",
-		     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->slave_pixmap->drawable.serialNumber));
-		crtc->slave_damage = DamageCreate(sna_crtc_slave_damage, NULL,
+		DBG(("%s: enabling PRIME secondary tracking on CRTC %d [pipe=%d], pixmap=%ld\n",
+		     __FUNCTION__, __sna_crtc_id(crtc), __sna_crtc_pipe(crtc), crtc->secondary_pixmap->drawable.serialNumber));
+		crtc->secondary_damage = DamageCreate(sna_crtc_secondary_damage, NULL,
 						  DamageReportRawRegion, TRUE,
 						  to_screen_from_sna(sna),
 						  crtc);
-		if (crtc->slave_damage == NULL) {
+		if (crtc->secondary_damage == NULL) {
 			if (!--sna->mode.shadow_active)
 				sna_mode_disable_shadow(sna);
 			return false;
 		}
 
-		DamageRegister(&crtc->slave_pixmap->drawable, crtc->slave_damage);
+		DamageRegister(&crtc->secondary_pixmap->drawable, crtc->secondary_damage);
 	}
 
 	crtc->shadow = true;
@@ -2116,11 +2116,11 @@
 	DBG(("%s: disabling for crtc %d\n", __FUNCTION__, __sna_crtc_id(crtc)));
 	assert(sna->mode.shadow_active > 0);
 
-	if (crtc->slave_damage) {
-		assert(crtc->slave_pixmap);
-		DamageUnregister(&crtc->slave_pixmap->drawable, crtc->slave_damage);
-		DamageDestroy(crtc->slave_damage);
-		crtc->slave_damage = NULL;
+	if (crtc->secondary_damage) {
+		assert(crtc->secondary_pixmap);
+		DamageUnregister(&crtc->secondary_pixmap->drawable, crtc->secondary_damage);
+		DamageDestroy(crtc->secondary_damage);
+		crtc->secondary_damage = NULL;
 	}
 
 	sna_crtc_disable_override(sna, crtc);
@@ -2392,7 +2392,7 @@
 		return true;
 	}
 
-	if (sna->flags & SNA_TEAR_FREE && to_sna_crtc(crtc)->slave_pixmap) {
+	if (sna->flags & SNA_TEAR_FREE && to_sna_crtc(crtc)->secondary_pixmap) {
 		DBG(("%s: TearFree shadow required\n", __FUNCTION__));
 		return true;
 	}
@@ -2659,7 +2659,7 @@
 			return NULL;
 		}
 
-		front = sna_crtc->slave_pixmap ?: sna->front;
+		front = sna_crtc->secondary_pixmap ?: sna->front;
 		if (__sna_pixmap_get_bo(front) && !rr_active(crtc)) {
 			BoxRec b;
 
@@ -2717,9 +2717,9 @@
 			sna_crtc->shadow_bo = NULL;
 		}
 
-		if (sna_crtc->slave_pixmap) {
+		if (sna_crtc->secondary_pixmap) {
 			DBG(("%s: attaching to scanout pixmap\n", __FUNCTION__));
-			bo = get_scanout_bo(sna, sna_crtc->slave_pixmap);
+			bo = get_scanout_bo(sna, sna_crtc->secondary_pixmap);
 			if (bo == NULL) {
 				DBG(("%s: failed to pin crtc scanout\n", __FUNCTION__));
 				sna_crtc->fallback_shadow = true;
@@ -2727,8 +2727,8 @@
 			}
 
 			if (!get_fb(sna, bo,
-				    sna_crtc->slave_pixmap->drawable.width,
-				    sna_crtc->slave_pixmap->drawable.height)) {
+				    sna_crtc->secondary_pixmap->drawable.width,
+				    sna_crtc->secondary_pixmap->drawable.height)) {
 				DBG(("%s: failed to bind fb for crtc scanout\n", __FUNCTION__));
 				sna_crtc->fallback_shadow = true;
 				goto force_shadow;
@@ -2752,7 +2752,7 @@
 		if (sna->flags & SNA_TEAR_FREE) {
 			RegionRec region;
 
-			assert(sna_crtc->slave_pixmap == NULL);
+			assert(sna_crtc->secondary_pixmap == NULL);
 
 			DBG(("%s: enabling TearFree shadow\n", __FUNCTION__));
 			region.extents.x1 = 0;
@@ -3286,7 +3286,7 @@
 	if (sna_crtc == NULL)
 		return FALSE;
 
-	if (pixmap == sna_crtc->slave_pixmap)
+	if (pixmap == sna_crtc->secondary_pixmap)
 		return TRUE;
 
 	DBG(("%s: CRTC:%d, pipe=%d setting scanout pixmap=%ld\n",
@@ -3296,7 +3296,7 @@
 	/* Disable first so that we can unregister the damage tracking */
 	sna_crtc_disable_shadow(to_sna(crtc->scrn), sna_crtc);
 
-	sna_crtc->slave_pixmap = pixmap;
+	sna_crtc->secondary_pixmap = pixmap;
 
 	return TRUE;
 }
@@ -7180,7 +7180,7 @@
 		if (crtc->bo == NULL)
 			continue;
 		assert(!crtc->transform);
-		assert(!crtc->slave_pixmap);
+		assert(!crtc->secondary_pixmap);
 		assert(crtc->bo->active_scanout);
 		assert(crtc->bo->refcnt >= crtc->bo->active_scanout);
 		assert(crtc->flip_bo == NULL);
@@ -8825,14 +8825,14 @@
 inline static DrawablePtr crtc_source(xf86CrtcPtr crtc, int16_t *sx, int16_t *sy)
 {
 	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
-	if (sna_crtc->slave_pixmap) {
-		DBG(("%s: using slave pixmap=%ld, offset (%d, %d)\n",
+	if (sna_crtc->secondary_pixmap) {
+		DBG(("%s: using secondary pixmap=%ld, offset (%d, %d)\n",
 		     __FUNCTION__,
-		     sna_crtc->slave_pixmap->drawable.serialNumber,
+		     sna_crtc->secondary_pixmap->drawable.serialNumber,
 		 -crtc->x, -crtc->y));
 		*sx = -crtc->x;
 		*sy = -crtc->y;
-		return &sna_crtc->slave_pixmap->drawable;
+		return &sna_crtc->secondary_pixmap->drawable;
 	} else {
 		DBG(("%s: using Screen pixmap=%ld\n",
 		     __FUNCTION__,
@@ -9263,7 +9263,7 @@
 		if (crtc->bo == NULL)
 			continue;
 
-		if (crtc->slave_pixmap)
+		if (crtc->secondary_pixmap)
 			continue;
 
 		if (crtc->client_bo)
@@ -9358,8 +9358,8 @@
 			}
 			RegionUninit(&damage);
 
-			if (sna_crtc->slave_damage)
-				DamageEmpty(sna_crtc->slave_damage);
+			if (sna_crtc->secondary_damage)
+				DamageEmpty(sna_crtc->secondary_damage);
 		}
 
 		RegionEmpty(region);
@@ -9529,8 +9529,8 @@
 		RegionUninit(&damage);
 		sigio_unblock(sigio);
 
-		if (sna_crtc->slave_damage)
-			DamageEmpty(sna_crtc->slave_damage);
+		if (sna_crtc->secondary_damage)
+			DamageEmpty(sna_crtc->secondary_damage);
 	}
 
 	if (sna->mode.shadow) {
diff -urN a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
--- a/src/sna/sna_dri2.c	2020-07-11 18:06:08.803330897 -0400
+++ b/src/sna/sna_dri2.c	2020-07-11 18:13:27.531734513 -0400
@@ -3741,7 +3741,7 @@
 	memset(&info, '\0', sizeof(info));
 	info.fd = sna->kgem.fd;
 	info.driverName = dri_driver_name(sna);
-	info.deviceName = intel_get_master_name(sna->dev);
+	info.deviceName = intel_get_primary_name(sna->dev);
 
 	DBG(("%s: loading dri driver '%s' [gen=%d] for device '%s'\n",
 	     __FUNCTION__, info.driverName, sna->kgem.gen, info.deviceName));
diff -urN a/src/sna/sna_driver.c b/src/sna/sna_driver.c
--- a/src/sna/sna_driver.c	2020-07-11 18:06:08.803330897 -0400
+++ b/src/sna/sna_driver.c	2020-07-11 18:13:27.532734618 -0400
@@ -270,13 +270,13 @@
 
 	sna_mode_set_primary(sna);
 
-	/* Try to become master and copy the current fbcon before the
+	/* Try to become primary and copy the current fbcon before the
 	 * actual VT switch. If we fail here, we will try to reset the
 	 * mode in the eventual VT switch. This can fail if systemd has
 	 * already revoked our KMS privileges, so just carry on regardless,
 	 * and hope that everything is sorted after the VT switch.
 	 */
-	if (intel_get_master(sna->dev) == 0) {
+	if (intel_get_primary(sna->dev) == 0) {
 		/* Only preserve the fbcon, not any subsequent server regens */
 		if (serverGeneration == 1 && (sna->flags & SNA_IS_HOSTED) == 0)
 			sna_copy_fbcon(sna);
@@ -963,7 +963,7 @@
 	sna_mode_reset(sna);
 	sna_accel_leave(sna);
 
-	if (scrn->vtSema && intel_put_master(sna->dev))
+	if (scrn->vtSema && intel_put_primary(sna->dev))
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "drmDropMaster failed: %s\n", strerror(errno));
 
@@ -1009,7 +1009,7 @@
 	}
 
 	if (scrn->vtSema) {
-		intel_put_master(sna->dev);
+		intel_put_primary(sna->dev);
 		scrn->vtSema = FALSE;
 	}
 
@@ -1294,7 +1294,7 @@
 	struct sna *sna = to_sna(scrn);
 
 	DBG(("%s(vtSema=%d)\n", __FUNCTION__, scrn->vtSema));
-	if (intel_get_master(sna->dev))
+	if (intel_get_primary(sna->dev))
 		return FALSE;
 
 	scrn->vtSema = TRUE;
diff -urN a/src/sna/sna_threads.c b/src/sna/sna_threads.c
--- a/src/sna/sna_threads.c	2020-07-11 18:06:08.805330898 -0400
+++ b/src/sna/sna_threads.c	2020-07-11 18:13:27.533734724 -0400
@@ -58,7 +58,7 @@
 	struct thread *t = arg;
 	sigset_t signals;
 
-	/* Disable all signals in the slave threads as X uses them for IO */
+	/* Disable all signals in the secondary threads as X uses them for IO */
 	sigfillset(&signals);
 	sigdelset(&signals, SIGBUS);
 	sigdelset(&signals, SIGSEGV);
diff -urN a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
--- a/src/uxa/intel_driver.c	2020-07-11 18:06:08.814330905 -0400
+++ b/src/uxa/intel_driver.c	2020-07-11 18:13:27.512732505 -0400
@@ -257,7 +257,7 @@
 	}
 }
 
-static Bool intel_open_drm_master(ScrnInfoPtr scrn)
+static Bool intel_open_drm_primary(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel->dev = intel_get_device(scrn, &intel->drmSubFD);
@@ -473,9 +473,9 @@
 
 	scrn->displayWidth = 640;	/* default it */
 
-	if (!intel_open_drm_master(scrn)) {
+	if (!intel_open_drm_primary(scrn)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
-			   "Failed to become DRM master.\n");
+			   "Failed to become DRM primary.\n");
 		return FALSE;
 	}
 
@@ -624,30 +624,30 @@
 	RegionRec pixregion;
 	int was_blocked;
 
-	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
+	PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
 	RegionTranslate(&pixregion, dirty->x, dirty->y);
 	RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
 	RegionTranslate(&pixregion, -dirty->x, -dirty->y);
 	was_blocked = RegionNil(&pixregion);
-	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+	DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
 	RegionUninit(&pixregion);
 	if (was_blocked)
 		return;
 
-	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
+	PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
 	PixmapSyncDirtyHelper(dirty, &pixregion);
 	RegionUninit(&pixregion);
 
         intel_flush(intel);
 	if (!intel->has_prime_vmap_flush) {
-		drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->slave_dst->master_pixmap);
+		drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->secondary_dst->primary_pixmap);
 		was_blocked = xf86BlockSIGIO();
 		drm_intel_bo_map(bo, FALSE);
 		drm_intel_bo_unmap(bo);
 		xf86UnblockSIGIO(was_blocked);
 	}
 
-	DamageRegionProcessPending(&dirty->slave_dst->drawable);
+	DamageRegionProcessPending(&dirty->secondary_dst->drawable);
 	return;
 }
 
@@ -1102,7 +1102,7 @@
 
 	xf86_hide_cursors(scrn);
 
-	if (intel_put_master(intel->dev))
+	if (intel_put_primary(intel->dev))
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "drmDropMaster failed: %s\n", strerror(errno));
 }
@@ -1115,7 +1115,7 @@
 	SCRN_INFO_PTR(arg);
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	if (intel_get_master(intel->dev)) {
+	if (intel_get_primary(intel->dev)) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "drmSetMaster failed: %s\n",
 			   strerror(errno));
diff -urN a/src/uxa/intel_uxa.c b/src/uxa/intel_uxa.c
--- a/src/uxa/intel_uxa.c	2020-07-11 18:06:08.814330905 -0400
+++ b/src/uxa/intel_uxa.c	2020-07-11 18:13:27.512732505 -0400
@@ -1136,7 +1136,7 @@
 
 #ifdef CREATE_PIXMAP_USAGE_SHARED
 static Bool
-intel_uxa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
+intel_uxa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **fd_handle)
 {
 	ScrnInfoPtr scrn = xf86ScreenToScrn(ppix->drawable.pScreen);
 	intel_screen_private *intel = intel_get_screen_private(scrn);