x11r7/xdriver_xf86-video-ati/0002-ati-cleanup-terminology-to-use-primary-secondary.patch

57  		xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
59  			if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
60 -				dirty->slave_dst =
61 +				dirty->secondary_dst =
67  	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
68  		if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
69 -			PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
70 +			PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
119 -radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
120 +radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
122 -    return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
123 +    return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
157 @@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
158  	if (dirty->rotation != RR_Rotate_0) {
160  					     &dirty->f_inverse,
161 -					     dirty->slave_dst->drawable.width,
162 -					     dirty->slave_dst->drawable.height);
163 +					     dirty->secondary_dst->drawable.width,
164 +					     dirty->secondary_dst->drawable.height);
168 @@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
171  	    RegionTranslate(dstregion, -dirty->x, -dirty->y);
172 -	    PixmapRegionInit(&pixregion, dirty->slave_dst);
173 +	    PixmapRegionInit(&pixregion, dirty->secondary_dst);
177 @@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
181 -	if (dirty->slave_dst->master_pixmap)
182 -	    DamageRegionAppend(&dirty->slave_dst->drawable, region);
183 +	if (dirty->secondary_dst->primary_pixmap)
184 +	    DamageRegionAppend(&dirty->secondary_dst->drawable, region);
187  	PixmapSyncDirtyHelper(dirty);
188 @@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
192 -	if (dirty->slave_dst->master_pixmap)
193 -	    DamageRegionProcessPending(&dirty->slave_dst->drawable);
194 +	if (dirty->secondary_dst->primary_pixmap)
195 +	    DamageRegionProcessPending(&dirty->secondary_dst->drawable);
198  	DamageEmpty(dirty->damage);
201  radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
203 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
204 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
209 -	if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
211 +	if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
215 @@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
219 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
220 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
222 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
223 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
230 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
231 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
233 -    ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
234 +    ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
241  call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
243 -    ScreenPtr master_screen = radeon_dirty_master(dirty);
244 +    ScreenPtr primary_screen = radeon_dirty_primary(dirty);
246 -    master_screen->SyncSharedPixmap(dirty);
247 +    primary_screen->SyncSharedPixmap(dirty);
253 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
254 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
256 -    ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
257 +    ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
264 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
265 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
267 -    ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
268 +    ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
275 @@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
277  radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
279 -    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
280 +    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
291  	if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
294 -	    if (master_has_sync_shared_pixmap(scrn, dirty))
295 +	    if (primary_has_sync_shared_pixmap(scrn, dirty))
296  		call_sync_shared_pixmap(dirty);
298  	    region = dirty_region(dirty);
303 -		dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
304 +		dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
307  	    redisplay_dirty(dirty, region);
310  radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
312 -    ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
313 +    ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
316      xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
317 @@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)