1 diff --git a/man/radeon.man b/man/radeon.man
2 index dcebf53754891c378f6bee8287e0834207efbbf0..247dcdb7d4ff790b4cf9024efec99add80df65e5 100644
3 --- a/man/radeon.man
4 +++ b/man/radeon.man
5 @@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off'
6 accordingly. If this option isn't set, the default value of the property is
7 .B auto,
8 which means that TearFree is on for rotated outputs, outputs with RandR
9 -transforms applied and for RandR 1.4 slave outputs, otherwise off.
10 +transforms applied and for RandR 1.4 secondary outputs, otherwise off.
11 .TP
12 .BI "Option \*qAccelMethod\*q \*q" "string" \*q
13 Chooses between available acceleration architectures. Valid values are
14 diff --git a/src/compat-api.h b/src/compat-api.h
15 index f4e7524f0055fd438b85b37ed284f6596a04468c..def6d3e4dd16ba71aed053a304966e4a5675aec4 100644
16 --- a/src/compat-api.h
17 +++ b/src/compat-api.h
18 @@ -34,4 +34,10 @@
19 #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
20 #endif
21
22 +#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
23 +#define current_primary current_master
24 +#define primary_pixmap master_pixmap
25 +#define secondary_dst slave_dst
26 +#endif
27 +
28 #endif
29 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
30 index 72f96a0ccab1f556b21b3ff093d0e3e4b2253df6..3099a729b3f4f4559b6c4f89b60b4946decce8ea 100644
31 --- a/src/drmmode_display.c
32 +++ b/src/drmmode_display.c
33 @@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
34 xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
35 ent) {
36 if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
37 - dirty->slave_dst =
38 + dirty->secondary_dst =
39 drmmode_crtc->scanout[scanout_id].pixmap;
40 break;
41 }
42 @@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
43
44 xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
45 if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
46 - PixmapStopDirtyTracking(dirty->src, dirty->slave_dst);
47 + PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst);
48 break;
49 }
50 }
51 diff --git a/src/evergreen_state.h b/src/evergreen_state.h
52 index 7e54e1c7f2c1b564e3ebbb5c820a8ca7eb547a53..34ba87b6ce81c9aa9c0c5787996d2873783a6ce6 100644
53 --- a/src/evergreen_state.h
54 +++ b/src/evergreen_state.h
55 @@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
56 int *new_pitch);
57 extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
58 extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
59 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
60 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
61 extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
62
63 #endif
64 diff --git a/src/r600_state.h b/src/r600_state.h
65 index 3434599674a27f124d20cb95d4b90a79bca98755..567c3ca22f3d6b7a6e65548291f7fabd2ad121d8 100644
66 --- a/src/r600_state.h
67 +++ b/src/r600_state.h
68 @@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
69 int *new_pitch);
70 extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv);
71 extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix);
72 -extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p);
73 +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p);
74 extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle);
75 #endif
76 diff --git a/src/radeon.h b/src/radeon.h
77 index e4a2ba66fe1331af38b0a10459f8d0cccb32316a..68d7756a02132f54b4ddb976a4dd31409c11c5d1 100644
78 --- a/src/radeon.h
79 +++ b/src/radeon.h
80 @@ -182,18 +182,18 @@ typedef enum {
81
82
83 static inline ScreenPtr
84 -radeon_master_screen(ScreenPtr screen)
85 +radeon_primary_screen(ScreenPtr screen)
86 {
87 - if (screen->current_master)
88 - return screen->current_master;
89 + if (screen->current_primary)
90 + return screen->current_primary;
91
92 return screen;
93 }
94
95 static inline ScreenPtr
96 -radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
97 +radeon_dirty_primary(PixmapDirtyUpdatePtr dirty)
98 {
99 - return radeon_master_screen(dirty->slave_dst->drawable.pScreen);
100 + return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen);
101 }
102
103 static inline DrawablePtr
104 diff --git a/src/radeon_exa.c b/src/radeon_exa.c
105 index 268155ed7f91255b119abb752e9681a3143e0c43..320ff9927b05437db7f9a79d91b1b2c73912b08e 100644
106 --- a/src/radeon_exa.c
107 +++ b/src/radeon_exa.c
108 @@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv)
109 free(driverPriv);
110 }
111
112 -Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle)
113 +Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle)
114 {
115 struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
116
117 diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
118 index f1098381ea0c5ea8066e1d2ab88ed8fdbacaebc5..ccf9994188e35e1072c4ebc2f383ad8d8898aa74 100644
119 --- a/src/radeon_glamor.c
120 +++ b/src/radeon_glamor.c
121 @@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap)
122
123
124 static Bool
125 -radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave,
126 +radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary,
127 void **handle_p)
128 {
129 ScreenPtr screen = pixmap->drawable.pScreen;
130 diff --git a/src/radeon_kms.c b/src/radeon_kms.c
131 index b3db7c41341dc3293e08a24f371d80ffb4001bd1..62962d61d8ee22a02567b7125b4bb3a7f7230be4 100644
132 --- a/src/radeon_kms.c
133 +++ b/src/radeon_kms.c
134 @@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
135 if (dirty->rotation != RR_Rotate_0) {
136 dstregion = transform_region(damageregion,
137 &dirty->f_inverse,
138 - dirty->slave_dst->drawable.width,
139 - dirty->slave_dst->drawable.height);
140 + dirty->secondary_dst->drawable.width,
141 + dirty->secondary_dst->drawable.height);
142 } else
143 #endif
144 {
145 @@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
146
147 dstregion = RegionDuplicate(damageregion);
148 RegionTranslate(dstregion, -dirty->x, -dirty->y);
149 - PixmapRegionInit(&pixregion, dirty->slave_dst);
150 + PixmapRegionInit(&pixregion, dirty->secondary_dst);
151 RegionIntersect(dstregion, dstregion, &pixregion);
152 RegionUninit(&pixregion);
153 }
154 @@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
155 if (RegionNil(region))
156 goto out;
157
158 - if (dirty->slave_dst->master_pixmap)
159 - DamageRegionAppend(&dirty->slave_dst->drawable, region);
160 + if (dirty->secondary_dst->primary_pixmap)
161 + DamageRegionAppend(&dirty->secondary_dst->drawable, region);
162
163 #ifdef HAS_DIRTYTRACKING_ROTATION
164 PixmapSyncDirtyHelper(dirty);
165 @@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
166 #endif
167
168 radeon_cs_flush_indirect(src_scrn);
169 - if (dirty->slave_dst->master_pixmap)
170 - DamageRegionProcessPending(&dirty->slave_dst->drawable);
171 + if (dirty->secondary_dst->primary_pixmap)
172 + DamageRegionProcessPending(&dirty->secondary_dst->drawable);
173
174 out:
175 DamageEmpty(dirty->damage);
176 @@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
177 void
178 radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
179 {
180 - ScreenPtr master_screen = radeon_dirty_master(dirty);
181 + ScreenPtr primary_screen = radeon_dirty_primary(dirty);
182 PixmapDirtyUpdatePtr ent;
183 RegionPtr region;
184
185 - xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
186 - if (!radeon_dirty_src_equals(dirty, ent->slave_dst))
187 + xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) {
188 + if (!radeon_dirty_src_equals(dirty, ent->secondary_dst))
189 continue;
190
191 region = dirty_region(ent);
192 @@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
193 #if HAS_SYNC_SHARED_PIXMAP
194
195 static Bool
196 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
197 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
198 {
199 - ScreenPtr master_screen = radeon_dirty_master(dirty);
200 + ScreenPtr primary_screen = radeon_dirty_primary(dirty);
201
202 - return !!master_screen->SyncSharedPixmap;
203 + return !!primary_screen->SyncSharedPixmap;
204 }
205
206 static Bool
207 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
208 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
209 {
210 - ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen;
211 + ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen;
212
213 - return !!slave_screen->SyncSharedPixmap;
214 + return !!secondary_screen->SyncSharedPixmap;
215 }
216
217 static void
218 call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
219 {
220 - ScreenPtr master_screen = radeon_dirty_master(dirty);
221 + ScreenPtr primary_screen = radeon_dirty_primary(dirty);
222
223 - master_screen->SyncSharedPixmap(dirty);
224 + primary_screen->SyncSharedPixmap(dirty);
225 }
226
227 #else /* !HAS_SYNC_SHARED_PIXMAP */
228
229 static Bool
230 -master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
231 +primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
232 {
233 - ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty));
234 + ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty));
235
236 - return master_scrn->driverName == scrn->driverName;
237 + return primary_scrn->driverName == scrn->driverName;
238 }
239
240 static Bool
241 -slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
242 +secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
243 {
244 - ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
245 + ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen);
246
247 - return slave_scrn->driverName == scrn->driverName;
248 + return secondary_scrn->driverName == scrn->driverName;
249 }
250
251 static void
252 @@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
253 static xf86CrtcPtr
254 radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty)
255 {
256 - ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
257 + ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
258 ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
259 xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
260 int c;
261
262 - /* Find the CRTC which is scanning out from this slave pixmap */
263 + /* Find the CRTC which is scanning out from this secondary pixmap */
264 for (c = 0; c < xf86_config->num_crtc; c++) {
265 xf86CrtcPtr xf86_crtc = xf86_config->crtc[c];
266 drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
267 @@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
268 if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) {
269 RegionPtr region;
270
271 - if (master_has_sync_shared_pixmap(scrn, dirty))
272 + if (primary_has_sync_shared_pixmap(scrn, dirty))
273 call_sync_shared_pixmap(dirty);
274
275 region = dirty_region(dirty);
276 @@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
277 radeon_cs_flush_indirect(scrn);
278 RegionCopy(&drmmode_crtc->scanout_last_region, region);
279 RegionTranslate(region, -crtc->x, -crtc->y);
280 - dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap;
281 + dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap;
282 }
283
284 redisplay_dirty(dirty, region);
285 @@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u
286 static void
287 radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
288 {
289 - ScreenPtr screen = dirty->slave_dst->drawable.pScreen;
290 + ScreenPtr screen = dirty->secondary_dst->drawable.pScreen;
291 ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
292 RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
293 xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty);
294 @@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
295 static void
296 radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
297 {
298 - ScreenPtr screen = ent->slave_dst->drawable.pScreen;
299 + ScreenPtr screen = ent->secondary_dst->drawable.pScreen;
300 ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
301 RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
302 xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent);
303 @@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn)
304 if (screen->isGPU) {
305 PixmapDirtyUpdatePtr region_ent = ent;
306
307 - if (master_has_sync_shared_pixmap(scrn, ent)) {
308 - ScreenPtr master_screen = radeon_dirty_master(ent);
309 + if (primary_has_sync_shared_pixmap(scrn, ent)) {
310 + ScreenPtr primary_screen = radeon_dirty_primary(ent);
311
312 - xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
313 - if (radeon_dirty_src_equals(ent, region_ent->slave_dst))
314 + xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) {
315 + if (radeon_dirty_src_equals(ent, region_ent->secondary_dst))
316 break;
317 }
318 }
319 @@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn)
320
321 RegionDestroy(region);
322 } else {
323 - if (slave_has_sync_shared_pixmap(scrn, ent))
324 + if (secondary_has_sync_shared_pixmap(scrn, ent))
325 continue;
326
327 region = dirty_region(ent);
328 @@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
329 (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
330 pScreen->BlockHandler = RADEONBlockHandler_KMS;
331
332 - if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema)
333 + if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema)
334 return;
335
336 if (!pScreen->isGPU)
337 @@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
338 xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
339 int c;
340
341 - if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema)
342 + if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema)
343 return 0;
344
345 /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After
|
