diff -urN a/src/amdgpu_dri3.c b/src/amdgpu_dri3.c --- a/src/amdgpu_dri3.c 2020-07-11 12:44:06.758760272 -0400 +++ b/src/amdgpu_dri3.c 2020-07-11 12:54:44.164515624 -0400 @@ -41,7 +41,7 @@ #include #include -static int open_master_node(ScreenPtr screen, int *out) +static int open_primary_node(ScreenPtr screen, int *out) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); @@ -112,7 +112,7 @@ ret = open_render_node(screen, out); if (ret != Success) - ret = open_master_node(screen, out); + ret = open_primary_node(screen, out); return ret; } diff -urN a/src/amdgpu_drv.h b/src/amdgpu_drv.h --- a/src/amdgpu_drv.h 2020-07-11 12:44:06.760760332 -0400 +++ b/src/amdgpu_drv.h 2020-07-11 12:54:44.164515624 -0400 @@ -168,18 +168,18 @@ } AMDGPUOpts; static inline ScreenPtr -amdgpu_master_screen(ScreenPtr screen) +amdgpu_primary_screen(ScreenPtr screen) { - if (screen->current_master) - return screen->current_master; + if (screen->current_primary) + return screen->current_primary; return screen; } static inline ScreenPtr -amdgpu_dirty_master(PixmapDirtyUpdatePtr dirty) +amdgpu_dirty_primary(PixmapDirtyUpdatePtr dirty) { - return amdgpu_master_screen(dirty->slave_dst->drawable.pScreen); + return amdgpu_primary_screen(dirty->secondary_dst->drawable.pScreen); } static inline DrawablePtr diff -urN a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c --- a/src/amdgpu_glamor.c 2020-07-11 12:44:06.761760362 -0400 +++ b/src/amdgpu_glamor.c 2020-07-11 12:54:44.164515624 -0400 @@ -349,7 +349,7 @@ static Bool -amdgpu_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, +amdgpu_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, void **handle_p) { ScreenPtr screen = pixmap->drawable.pScreen; diff -urN a/src/amdgpu_kms.c b/src/amdgpu_kms.c --- a/src/amdgpu_kms.c 2020-07-11 12:44:06.763760422 -0400 +++ b/src/amdgpu_kms.c 2020-07-11 12:54:44.165515653 -0400 @@ -604,8 +604,8 @@ if (dirty->rotation != RR_Rotate_0) { dstregion = transform_region(damageregion, &dirty->f_inverse, - dirty->slave_dst->drawable.width, - dirty->slave_dst->drawable.height); + dirty->secondary_dst->drawable.width, + dirty->secondary_dst->drawable.height); } else #endif { @@ -613,7 +613,7 @@ dstregion = RegionDuplicate(damageregion); RegionTranslate(dstregion, -dirty->x, -dirty->y); - PixmapRegionInit(&pixregion, dirty->slave_dst); + PixmapRegionInit(&pixregion, dirty->secondary_dst); RegionIntersect(dstregion, dstregion, &pixregion); RegionUninit(&pixregion); } @@ -630,8 +630,8 @@ if (RegionNil(region)) goto out; - if (dirty->slave_dst->master_pixmap) - DamageRegionAppend(&dirty->slave_dst->drawable, region); + if (dirty->secondary_dst->primary_pixmap) + DamageRegionAppend(&dirty->secondary_dst->drawable, region); #ifdef HAS_DIRTYTRACKING_ROTATION PixmapSyncDirtyHelper(dirty); @@ -640,8 +640,8 @@ #endif amdgpu_glamor_flush(src_scrn); - if (dirty->slave_dst->master_pixmap) - DamageRegionProcessPending(&dirty->slave_dst->drawable); + if (dirty->secondary_dst->primary_pixmap) + DamageRegionProcessPending(&dirty->secondary_dst->drawable); out: DamageEmpty(dirty->damage); @@ -658,12 +658,12 @@ void amdgpu_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) { - ScreenPtr master_screen = amdgpu_dirty_master(dirty); + ScreenPtr primary_screen = amdgpu_dirty_primary(dirty); PixmapDirtyUpdatePtr ent; RegionPtr region; - xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) { - if (!amdgpu_dirty_src_equals(dirty, ent->slave_dst)) + xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) { + if (!amdgpu_dirty_src_equals(dirty, ent->secondary_dst)) continue; region = dirty_region(ent); @@ -676,45 +676,45 @@ #if HAS_SYNC_SHARED_PIXMAP static Bool -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) { - ScreenPtr master_screen = amdgpu_dirty_master(dirty); + ScreenPtr primary_screen = amdgpu_dirty_primary(dirty); - return master_screen->SyncSharedPixmap != NULL; + return primary_screen->SyncSharedPixmap != NULL; } static Bool -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) { - ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen; + ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen; - return slave_screen->SyncSharedPixmap != NULL; + return secondary_screen->SyncSharedPixmap != NULL; } static void call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) { - ScreenPtr master_screen = amdgpu_dirty_master(dirty); + ScreenPtr primary_screen = amdgpu_dirty_primary(dirty); - master_screen->SyncSharedPixmap(dirty); + primary_screen->SyncSharedPixmap(dirty); } #else /* !HAS_SYNC_SHARED_PIXMAP */ static Bool -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) { - ScrnInfoPtr master_scrn = xf86ScreenToScrn(amdgpu_dirty_master(dirty)); + ScrnInfoPtr primary_scrn = xf86ScreenToScrn(amdgpu_dirty_primary(dirty)); - return master_scrn->driverName == scrn->driverName; + return primary_scrn->driverName == scrn->driverName; } static Bool -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) { - ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen); + ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen); - return slave_scrn->driverName == scrn->driverName; + return secondary_scrn->driverName == scrn->driverName; } static void @@ -729,12 +729,12 @@ static xf86CrtcPtr amdgpu_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty) { - ScreenPtr screen = dirty->slave_dst->drawable.pScreen; + ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; ScrnInfoPtr scrn = xf86ScreenToScrn(screen); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); int c; - /* Find the CRTC which is scanning out from this slave pixmap */ + /* Find the CRTC which is scanning out from this secondary pixmap */ for (c = 0; c < xf86_config->num_crtc; c++) { xf86CrtcPtr xf86_crtc = xf86_config->crtc[c]; drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; @@ -759,7 +759,7 @@ if (amdgpu_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { RegionPtr region; - if (master_has_sync_shared_pixmap(scrn, dirty)) + if (primary_has_sync_shared_pixmap(scrn, dirty)) call_sync_shared_pixmap(dirty); region = dirty_region(dirty); @@ -772,7 +772,7 @@ amdgpu_glamor_flush(scrn); RegionCopy(&drmmode_crtc->scanout_last_region, region); RegionTranslate(region, -crtc->x, -crtc->y); - dirty->slave_dst = drmmode_crtc->scanout[scanout_id]; + dirty->secondary_dst = drmmode_crtc->scanout[scanout_id]; } redisplay_dirty(dirty, region); @@ -799,7 +799,7 @@ static void amdgpu_prime_scanout_update(PixmapDirtyUpdatePtr dirty) { - ScreenPtr screen = dirty->slave_dst->drawable.pScreen; + ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; ScrnInfoPtr scrn = xf86ScreenToScrn(screen); AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); xf86CrtcPtr xf86_crtc = amdgpu_prime_dirty_to_crtc(dirty); @@ -863,7 +863,7 @@ static void amdgpu_prime_scanout_flip(PixmapDirtyUpdatePtr ent) { - ScreenPtr screen = ent->slave_dst->drawable.pScreen; + ScreenPtr screen = ent->secondary_dst->drawable.pScreen; ScrnInfoPtr scrn = xf86ScreenToScrn(screen); AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); xf86CrtcPtr crtc = amdgpu_prime_dirty_to_crtc(ent); @@ -938,11 +938,11 @@ if (screen->isGPU) { PixmapDirtyUpdatePtr region_ent = ent; - if (master_has_sync_shared_pixmap(scrn, ent)) { - ScreenPtr master_screen = amdgpu_dirty_master(ent); + if (primary_has_sync_shared_pixmap(scrn, ent)) { + ScreenPtr primary_screen = amdgpu_dirty_primary(ent); - xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) { - if (amdgpu_dirty_src_equals(ent, region_ent->slave_dst)) + xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) { + if (amdgpu_dirty_src_equals(ent, region_ent->secondary_dst)) break; } } @@ -966,7 +966,7 @@ RegionDestroy(region); } else { - if (slave_has_sync_shared_pixmap(scrn, ent)) + if (secondary_has_sync_shared_pixmap(scrn, ent)) continue; region = dirty_region(ent); @@ -1257,7 +1257,7 @@ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); pScreen->BlockHandler = AMDGPUBlockHandler_KMS; - if (!xf86ScreenToScrn(amdgpu_master_screen(pScreen))->vtSema) + if (!xf86ScreenToScrn(amdgpu_primary_screen(pScreen))->vtSema) return; if (!pScreen->isGPU) @@ -1809,7 +1809,7 @@ } } -static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn) +static Bool amdgpu_set_drm_primary(ScrnInfoPtr pScrn) { AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); int err; @@ -1822,12 +1822,12 @@ err = drmSetMaster(pAMDGPUEnt->fd); if (err) - ErrorF("Unable to retrieve master\n"); + ErrorF("Unable to retrieve primary\n"); return err == 0; } -static void amdgpu_drop_drm_master(ScrnInfoPtr pScrn) +static void amdgpu_drop_drm_primary(ScrnInfoPtr pScrn) { AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); @@ -1850,7 +1850,7 @@ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); int c; - if (xf86ScreenToScrn(amdgpu_master_screen(screen))->vtSema) + if (xf86ScreenToScrn(amdgpu_primary_screen(screen))->vtSema) return 0; /* Unreference the all-black FB created by AMDGPULeaveVT_KMS. After @@ -1913,7 +1913,7 @@ } amdgpu_sync_close(pScreen); - amdgpu_drop_drm_master(pScrn); + amdgpu_drop_drm_primary(pScrn); drmmode_fini(pScrn, &info->drmmode); if (info->dri2.enabled) { @@ -1964,7 +1964,7 @@ return FALSE; miSetPixmapDepths(); - if (!amdgpu_set_drm_master(pScrn)) + if (!amdgpu_set_drm_primary(pScrn)) return FALSE; info->directRenderingEnabled = FALSE; @@ -2199,7 +2199,7 @@ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, AMDGPU_LOGLEVEL_DEBUG, "AMDGPUEnterVT_KMS\n"); - amdgpu_set_drm_master(pScrn); + amdgpu_set_drm_primary(pScrn); if (info->shadow_fb) { int pitch; @@ -2225,7 +2225,7 @@ if (!front_buffer) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to allocate new scanout BO after VT switch, " - "other DRM masters may see screen contents\n"); + "other DRM primarys may see screen contents\n"); } } @@ -2360,7 +2360,7 @@ hide_cursors: xf86_hide_cursors(pScrn); - amdgpu_drop_drm_master(pScrn); + amdgpu_drop_drm_primary(pScrn); xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, AMDGPU_LOGLEVEL_DEBUG, "Ok, leaving now...\n"); diff -urN a/src/amdgpu_probe.c b/src/amdgpu_probe.c --- a/src/amdgpu_probe.c 2020-07-11 12:44:06.766760512 -0400 +++ b/src/amdgpu_probe.c 2020-07-11 12:54:44.165515653 -0400 @@ -192,7 +192,7 @@ return drmAuthMagic(fd, 0) != -EACCES; } -static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn, +static Bool amdgpu_open_drm_primary(ScrnInfoPtr pScrn, struct pci_device *pci_dev, struct xf86_platform_device *platform_dev, AMDGPUEntPtr pAMDGPUEnt) @@ -201,10 +201,10 @@ if (pAMDGPUEnt->fd == -1) return FALSE; - /* Check that what we opened is a master or a master-capable FD */ + /* Check that what we opened is a primary or a primary-capable FD */ if (!local_drmIsMaster(pAMDGPUEnt->fd)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "[drm] device is not DRM master.\n"); + "[drm] device is not DRM primary.\n"); amdgpu_kernel_close_fd(pAMDGPUEnt); return FALSE; } @@ -221,7 +221,7 @@ uint32_t minor_version; pAMDGPUEnt->platform_dev = platform_dev; - if (!amdgpu_open_drm_master(pScrn, pci_dev, platform_dev, + if (!amdgpu_open_drm_primary(pScrn, pci_dev, platform_dev, pAMDGPUEnt)) return FALSE; diff -urN a/src/drmmode_display.c b/src/drmmode_display.c --- a/src/drmmode_display.c 2020-07-11 12:44:06.770760633 -0400 +++ b/src/drmmode_display.c 2020-07-11 12:54:44.166515682 -0400 @@ -658,7 +658,7 @@ xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { if (amdgpu_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { - dirty->slave_dst = + dirty->secondary_dst = drmmode_crtc->scanout[scanout_id]; break; } @@ -1790,7 +1790,7 @@ xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { if (amdgpu_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { - PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); + PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst); break; } }