« back to all changes in this revision
Viewing changes to ChangeLog
- browse files at revision 2
- compare with another revision
- download diff
- download tarball
- view history from revision 2
- Committer: Package Import Robot
- Author(s): Timo Aaltonen
- Date: 2016-05-03 14:02:21 UTC
- Revision ID: package-import@ubuntu.com-20160503140221-p5jty1kzz5nzj107
Tags: 2:1.18.3-1ubuntu2.2~trusty1
* Backport for lts-xenial stack.
- revert configurable maxclients, avoid depending on newer coreproto
- rules: work around ftbfs on ppc64el
- revert configurable maxclients, avoid depending on newer coreproto
- rules: work around ftbfs on ppc64el
- files added:
- .dir-locals.el
- debian
- debian/local
- debian/patches
- debian/po
- debian/upstream
- files modified:
- ChangeLog
added
removed
ChangeLog
1
commit 9454cd51da9b38b974cff7c8b7125901f6403848
2
Author: Adam Jackson <ajax@redhat.com>
3
Date: Mon Apr 4 14:39:36 2016 -0400
4
5
xserver 1.18.3
6
7
Signed-off-by: Adam Jackson <ajax@redhat.com>
8
9
commit 082d5ea9a8f882c5ab7c30c481e2d9a5c5f11376
10
Author: Olivier Fourdan <ofourdan@redhat.com>
11
Date: Mon Mar 21 09:53:17 2016 +0100
12
13
xwayland: Pretend we support viewport in vidmode
14
15
Some games (namely openttd) will raise an XError and fail with a
16
BadValue if their request to XF86VidModeSetViewPort fails.
17
18
Support only the default zoom and viewport, fail for everything else.
19
20
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
21
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
22
(cherry picked from commit 44e1c97ca6fe992bbb6ef9ecb0b82a113adfa57e)
23
24
commit fcb89adb4a6cde585923e63d3c34df465aa78d1b
25
Author: Olivier Fourdan <ofourdan@redhat.com>
26
Date: Thu Mar 17 14:39:45 2016 +0100
27
28
xwayland: do not include frequency in mode name
29
30
Some applications (e.g. using lwjgl) try to parse the output of the
31
xrandr command and get confused with the mode name returned by Xwayland,
32
because it contains "@[frequency]" (e.g. "1024x640@60.0Hz").
33
34
Remove the @[frequency] part of the mode name to match what is found in
35
usual mode names on regular X servers to please those applications.
36
37
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94589
38
39
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
40
Reviewed-by: Daniel Stone <daniels@collabora.com>
41
(cherry picked from commit 6e3a6e30a6ac66942a0756a5d079993181f02e34)
42
43
commit b8f9fd83189bd5593793c1cfcbfedb5150d7c5a5
44
Author: Michel Dänzer <michel.daenzer@amd.com>
45
Date: Thu Mar 24 17:34:23 2016 +0900
46
47
xfree86/modes: Make sure the HW cursor is hidden when it should be
48
49
When the HW cursor is hidden (e.g. because xf86CursorResetCursor
50
triggers a switch from HW cursor to SW cursor), the driver isn't
51
notified of this for disabled CRTCs. If the HW cursor was shown when the
52
CRTC was disabled, it may still be displayed when the CRTC is enabled
53
again.
54
55
Prevent this by explicitly hiding the HW cursor again after setting a
56
mode if it's currently supposed to be hidden.
57
58
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560
59
Reviewed-by: Adam Jackson <ajax@redhat.com>
60
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
61
(cherry picked from commit 418fe365b45a143680d3b4143dc60f7cdc5a3507)
62
63
commit 1211d483d4581ee5ccbd50c654d30cf3318fe7c6
64
Author: Sonny Jiang <sonny.jiang@amd.com>
65
Date: Mon Mar 28 16:36:50 2016 +0900
66
67
DRI2: add Polaris PCI IDs
68
69
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
70
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (Polaris10)
71
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (Polaris11)
72
73
(Ported from Mesa commit f00c840578a70e479ffb99f6b64c73dc420179fa)
74
75
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
76
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
77
(cherry picked from commit 1c90797565385426ad63bd2108085c8466695c0b)
78
79
commit 07ad2fde78f07e98caaf3e9b6b67af15359fefe4
80
Author: Michel Dänzer <michel.daenzer@amd.com>
81
Date: Thu Mar 24 17:42:47 2016 +0900
82
83
present: Only requeue for next MSC after flip failure
84
85
This code was added to deal with the driver present hook failing, in
86
which case we need to wait for the next MSC before executing the
87
presentation.
88
89
However, it could also take effect in cases where the driver incorrectly
90
thinks the current MSC matches the target one (e.g. due to the kernel
91
interface only supporting 32-bit MSC values), in which case it could
92
result in the presentation getting requeued over and over.
93
94
To prevent such issues, check specifically for the target MSC
95
immediately following the current MSC.
96
97
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94596
98
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
99
Reviewed-by: Keith Packard <keithp@keithp.com>
100
(cherry picked from commit 3b385105b2d19a1c55e9779ae88d775185eea231)
101
102
commit e8f785f82ec8d3a76ae377c7430b1945180cba00
103
Author: Adam Jackson <ajax@redhat.com>
104
Date: Wed Mar 23 14:42:08 2016 -0400
105
106
vfb: Re-add LD_EXPORT_SYMBOLS_FLAG to LDFLAGS
107
108
Accidentally removed, breaks Xvfb on cygwin.
109
110
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
111
Signed-off-by: Adam Jackson <ajax@redhat.com>
112
(cherry picked from commit 8ac0e05cc6c6e87b223ba7cb31d8856771c5d41a)
113
114
commit fb8ddcf1cb0f47257370c3d6a895a5a41bea8dc0
115
Author: Dave Airlie <airlied@redhat.com>
116
Date: Wed Mar 16 10:45:54 2016 +1000
117
118
glamor: swizzle RED to 0 for alpha textures
119
120
I'm pretty sure Eric suspected this could cause a problem, and we
121
couldn't find a test. Well loading feedly in firefox seems to trigger
122
badness that this solves.
123
124
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554
125
Reviewed-by: Adam Jackson <ajax@redhat.com>
126
Signed-off-by: Dave Airlie <airlied@redhat.com>
127
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
128
(cherry picked from commit a288cf58a0dc0f965a6f964c76bb86bb1989d797)
129
130
commit 1bffe77769a9dce623e4a587ed3895ba003c257b
131
Author: Chris Wilson <chris@chris-wilson.co.uk>
132
Date: Sun Mar 13 13:54:01 2016 +0000
133
134
Xext/vidmode: Reduce verbosity of GetModeLine debug messages
135
136
In commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
137
Author: Olivier Fourdan <ofourdan@redhat.com>
138
Date: Wed Feb 10 09:34:34 2016 +0100
139
140
vidmode: move to a separate library of its own
141
142
the verbosity of some old debug messages (which print the reply to every
143
GetModeLine client request and others) was increased leading to lots of
144
log spam. Downgrade the logging back to DebugF.
145
146
[ajax: Fix a typo so it compiles.]
147
148
Reviewed-by: Adam Jackson <ajax@redhat.com>
149
References: https://bugs.freedesktop.org/show_bug.cgi?id=94515
150
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
151
Cc: Olivier Fourdan <ofourdan@redhat.com>
152
(cherry picked from commit 75eecf28ae3709181a51571132b0accd9cae316e)
153
154
commit 93d4224ccf3dee5a51815a66f76c905450419b50
155
Author: Adam Jackson <ajax@redhat.com>
156
Date: Fri Mar 11 16:38:52 2016 -0500
157
158
xserver 1.18.2
159
160
Signed-off-by: Adam Jackson <ajax@redhat.com>
161
162
commit d88f8ffeb7ec0304d793388be5b65a293505bc3b
163
Author: Adam Jackson <ajax@redhat.com>
164
Date: Fri Mar 11 13:50:32 2016 -0500
165
166
vidmode: Remove stray vidmodeproc.h from EXTRA_DIST
167
168
Was removed from the tree in:
169
170
commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
171
Author: Olivier Fourdan <ofourdan@redhat.com>
172
Date: Wed Feb 10 09:34:34 2016 +0100
173
174
vidmode: move to a separate library of its own
175
176
but not removed from the Makefile, which broke 'make dist'.
177
178
Signed-off-by: Adam Jackson <ajax@redhat.com>
179
(cherry picked from commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b)
180
181
commit 643359fb03c51244c9ed5f5efab4c84594259e8c
182
Author: Dave Airlie <airlied@gmail.com>
183
Date: Tue Feb 9 16:54:22 2016 +1000
184
185
present: fail flipping if we have any slave outputs
186
187
Due to the way present currently works, we don't ever check with the
188
secondary adapters if we can flip at all.
189
190
We shouldn't flip if the secondary adapters are attached to the pixmap
191
currently, however using the current check_flip callback isn't possible
192
as it passes the Window to the driver (something we shouldn't be doing),
193
so the slave driver can never get it's own screen ptr back.
194
195
For now to fix the problem just block flips if we have any slaves
196
configured. We can fix the ABI up later, but this fix can be backported
197
to stable.
198
199
Signed-off-by: Dave Airlie <airlied@redhat.com>
200
Reviewed-by: Keith Packard <keithp@keithp.com>
201
(cherry picked from commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b)
202
203
commit 3e480c6f5168e7da1521bdcc15ed8b5b8762612d
204
Author: Adam Jackson <ajax@redhat.com>
205
Date: Thu Jan 21 12:47:57 2016 -0500
206
207
glx: Implement GLX_EXT_fbconfig_packed_float
208
209
The tokens for this are already defined by GLX_ARB_fbconfig_float, which
210
we already support, so just add the extension to the list and let the
211
driver provide those configs if it wants.
212
213
Reviewed-by: Eric Anholt <eric@anholt.net>
214
Signed-off-by: Adam Jackson <ajax@redhat.com>
215
(cherry picked from commit ef3005da3d5dc92b3ee5a0ee78164e739a3216dc)
216
217
commit b9f7edda0634955711870bb1389095525d4496e3
218
Author: Adam Jackson <ajax@redhat.com>
219
Date: Mon May 18 13:00:02 2015 -0400
220
221
glx: Implement GLX_EXT_stereo_tree
222
223
This is correct as it is, but only because we know no DRI drivers
224
implement stereo.
225
226
v2: Use new ATTRIB macro
227
228
Reviewed-by: James Jones <jajones@nvidia.com>
229
Reviewed-by: Eric Anholt <eric@anholt.net>
230
Signed-off-by: Adam Jackson <ajax@redhat.com>
231
(cherry picked from commit d15cb654b6ba365dac9a62064e277adebde2fdab)
232
233
commit 2b3363418a425bf432b55927d8f8dd93c004c791
234
Author: Adam Jackson <ajax@redhat.com>
235
Date: Thu Mar 3 16:50:02 2016 -0500
236
237
glx: Add GLX_SCREEN to the GetDrawableAttributes response
238
239
libglvnd would like to use this to map from drawable to screen, so it
240
can know which driver to dispatch to. Refer to the spec proposal here:
241
242
https://lists.freedesktop.org/archives/mesa-dev/2016-March/109543.html
243
244
Reviewed-by: Eric Anholt <eric@anholt.net>
245
Signed-off-by: Adam Jackson <ajax@redhat.com>
246
(cherry picked from commit a18238877bbf9aab95843d849a6f434275e9cd6c)
247
248
commit 2541d765fdd1006d649063882e3a667438f1d30e
249
Author: Adam Jackson <ajax@redhat.com>
250
Date: Thu Mar 10 12:29:34 2016 -0500
251
252
glx: Macroize building the attribute list in DoGetDrawableAttributes
253
254
No functional change, just a little easier to read and harder to get
255
wrong.
256
257
Reviewed-by: Eric Anholt <eric@anholt.net>
258
Signed-off-by: Adam Jackson <ajax@redhat.com>
259
(cherry picked from commit 47c1d6b7abcfb1c6b478367bbc2e869c91485bc0)
260
261
commit 2a7b6ea1a54a4c8174669c1ca38c4665505c4637
262
Author: Eric Anholt <eric@anholt.net>
263
Date: Mon Feb 1 13:58:15 2016 -0800
264
265
ephyr: Fix redisplay with glamor on GLES.
266
267
glamor_transfer.c is still totally broken, though.
268
269
Reviewed-by: Adam Jackson <ajax@redhat.com>
270
Signed-off-by: Eric Anholt <eric@anholt.net>
271
(cherry picked from commit c01094c5312fbd84146dd83122e5256a8e57d092)
272
273
commit 5af20f15636aa2ede3dac1af9e9afa063564130c
274
Author: Olivier Fourdan <ofourdan@redhat.com>
275
Date: Wed Mar 9 16:45:18 2016 +0100
276
277
glamor: do not build Xv support when --disable-xv
278
279
Reviewed-by: Adam Jackson <ajax@redhat.com>
280
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
281
(cherry picked from commit 25ce263fd88684be9370025f93ba3a2bfc72ff1a)
282
283
commit 9fc05b85e544638ccc4b811c19e64312b387c799
284
Author: Olivier Fourdan <ofourdan@redhat.com>
285
Date: Wed Mar 9 16:21:18 2016 +0100
286
287
xwayland: add glamor Xv adaptor
288
289
This adds an Xv adaptor using glamor.
290
291
Reviewed-by: Adam Jackson <ajax@redhat.com>
292
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
293
(cherry picked from commit da7724d3d277c6c8a814881785b716896802629a)
294
295
commit 1aa9a2be313c51a78af9bceea865dcf069e9cebe
296
Author: Michel Dänzer <michel.daenzer@amd.com>
297
Date: Mon Dec 21 17:54:08 2015 +0900
298
299
modesetting: Allow CRTC transforms to actually take effect
300
301
Setting crtc->transformPresent to FALSE was preventing the transform
302
from actually taking effect and putting RandR into a confused state.
303
304
Now that the RandR 1.2 cursor code handles transforms correctly, we can
305
allow them to properly take effect.
306
307
Reviewed-by: Keith Packard <keithp@keithp.com>
308
(cherry picked from commit 24042b4e367803dd64f3fcdc1bef7b2bf36c4145)
309
310
commit aa8770bf546a58e534ad2d0e0180f7e1013e24e9
311
Author: Michel Dänzer <michel.daenzer@amd.com>
312
Date: Wed Oct 21 18:33:46 2015 +0900
313
314
xfree86: Re-set current cursor after RandR 1.2 CRTC configuration change
315
316
Add xf86CursorResetCursor, which allows switching between HW and SW
317
cursor depending on the current state.
318
319
Call it from xf86DisableUnusedFunctions, which is called after any CRTC
320
configuration change such as setting a mode or disabling a CRTC. This
321
makes sure that SW cursor is used e.g. while a transform is in use on
322
any CRTC or while there are active PRIME output slaves, and enables HW
323
cursor again once none of those conditions are true anymore.
324
325
Reviewed-by: Keith Packard <keithp@keithp.com>
326
(cherry picked from commit b04767c84deafc44993723add4b1c5163fc11711)
327
328
commit 870d4e2e6b40f911049a5286d605814d2401741d
329
Author: Michel Dänzer <michel.daenzer@amd.com>
330
Date: Thu Dec 24 12:56:03 2015 +0900
331
332
xfree86/modes: Check for CRTC transforms in xf86_use_hw_cursor(_argb) (v2)
333
334
We currently don't handle transforms for the HW cursor image, so return
335
FALSE to signal a software cursor must be used if a transform is in use
336
on any CRTC.
337
338
v2: Check crtc->transformPresent instead of crtc->transform_in_use. The
339
latter is TRUE for rotation as well, which we handle correctly.
340
341
Reviewed-by: Keith Packard <keithp@keithp.com>
342
(cherry picked from commit a4ffa8721debb34bd36fd4624890d9c26886c618)
343
344
commit af87ab62878334ee9d4e75c472fc80178329b4dd
345
Author: Michel Dänzer <michel.daenzer@amd.com>
346
Date: Thu Dec 24 16:20:49 2015 +0900
347
348
xfree86/modes: Refactor xf86_use_hw_cursor_argb to use xf86_use_hw_cursor (v2)
349
350
This reduces code duplication.
351
352
v2: No functional change this time.
353
354
Reviewed-by: Keith Packard <keithp@keithp.com>
355
(cherry picked from commit c3e4e9fc5d84bfc17b3ed63f67488ea25ba150ce)
356
357
commit 87c23dc47160d7524b82b60abbc70d285708f7cb
358
Author: Michel Dänzer <michel.daenzer@amd.com>
359
Date: Tue Feb 23 17:19:03 2016 +0900
360
361
glamor: Source pictures are always depth 32
362
363
We were using the destination pixmap depth to determine the source
364
picture format.
365
366
Fixes incorrect text rendering with some MATE desktop GTK3 themes.
367
368
Reviewed-by: Adam Jackson <ajax@redhat.com>
369
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246
370
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
371
(cherry picked from commit a3e681eafa5355b8bb3b099d47983f14f0d5e197)
372
373
commit 0220275531552a5400c22b56105257586f390260
374
Author: Michel Dänzer <michel.daenzer@amd.com>
375
Date: Tue Feb 23 17:19:02 2016 +0900
376
377
glamor: Factor out glamor_set_color_depth from glamor_set_color
378
379
The former takes explicit screen and depth parameters instead of
380
deriving them from a pixmap.
381
382
Reviewed-by: Adam Jackson <ajax@redhat.com>
383
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
384
(cherry picked from commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a)
385
386
commit 79985270f1d63a8b186640b81d0eb142ac532e6e
387
Author: Hans de Goede <hdegoede@redhat.com>
388
Date: Wed Feb 10 16:40:43 2016 +0100
389
390
glamor: Fix XvPutImage when src_y != 0
391
392
We already take src_y into account when uploading the src data by
393
starting at the top line of the src data when uploading.
394
395
Adjust src_y accordingly when rendering.
396
397
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
398
(cherry picked from commit 947e94a341fa153258e9e86060b83af95934672b)
399
400
commit ddca8e1647d3b79f803f4080be648e5475055fe8
401
Author: Rui Matos <tiagomatos@gmail.com>
402
Date: Fri Mar 4 16:24:48 2016 +0100
403
404
build: Enable vidmode independently from Xorg
405
406
This allows building Xwayland without Xorg and still include the
407
vidmode extension.
408
409
v2: Use PKG_CHECK_EXISTS instead of PKG_CHECK_MODULES
410
411
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
412
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
413
(cherry picked from commit 40a164b8f4e720b0d6ebf228ee175eb397ffeec2)
414
415
commit 7680f558e1584a191554658ff7b3b75c75d35e06
416
Author: Julien Cristau <jcristau@debian.org>
417
Date: Mon Mar 7 23:20:34 2016 +0100
418
419
xfixes: avoid double free if AddResource fails
420
421
pChc is already freed through CursorFreeHideCount →
422
deleteCursorHideCount.
423
424
Reviewed-by: Rémi Cardona <remi@gentoo.org>
425
Signed-off-by: Julien Cristau <jcristau@debian.org>
426
(cherry picked from commit 2be527b1d4ce2b0412c4484539a8c9607645ec6d)
427
428
commit b7e1f25005f7b552870fe782fc927c9dc97f5ed0
429
Author: Julien Cristau <jcristau@debian.org>
430
Date: Mon Mar 7 23:20:33 2016 +0100
431
432
render: free already allocated formats in PictureInit failure case
433
434
Probably pointless, if this fails you're not likely to get far...
435
436
Reviewed-by: Rémi Cardona <remi@gentoo.org>
437
Signed-off-by: Julien Cristau <jcristau@debian.org>
438
(cherry picked from commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0)
439
440
commit 518a0c179f99e9ea33e9cd56ce215661d27cabb6
441
Author: Julien Cristau <jcristau@debian.org>
442
Date: Mon Mar 7 23:20:32 2016 +0100
443
444
record: don't call RecordDeleteContext when AddResource fails
445
446
Reviewed-by: Rémi Cardona <remi@gentoo.org>
447
Signed-off-by: Julien Cristau <jcristau@debian.org>
448
(cherry picked from commit 054f80717812d4781741cd05393623fe6f6c627f)
449
450
commit dae9c195a9db4d210855a16efce2037f3af454e1
451
Author: Julien Cristau <jcristau@debian.org>
452
Date: Mon Mar 7 23:20:31 2016 +0100
453
454
xwin: no need to free auth data if AddResource fails
455
456
This is taken care of by SecurityDeleteAuthorization
457
458
Reviewed-by: Rémi Cardona <remi@gentoo.org>
459
Signed-off-by: Julien Cristau <jcristau@debian.org>
460
(cherry picked from commit d0c1a5bc61a3d151f2234aa3820862f16c0f00c7)
461
462
commit 4bbaffc8134a72d4e2dd21d4def1afc9ad29e815
463
Author: Julien Cristau <jcristau@debian.org>
464
Date: Mon Mar 7 23:20:30 2016 +0100
465
466
modesetting: avoid double free if AddResource fails
467
468
ms_dri2_frame_event_client_gone or ms_dri2_frame_event_drawable_gone
469
already free the resource.
470
471
Reviewed-by: Rémi Cardona <remi@gentoo.org>
472
Signed-off-by: Julien Cristau <jcristau@debian.org>
473
(cherry picked from commit acf263df81ad6813e0233033610fb44521cab1b4)
474
475
commit 8616bd95de43aa63c959b0c978f1001ac38c0222
476
Author: Julien Cristau <jcristau@debian.org>
477
Date: Mon Mar 7 23:20:29 2016 +0100
478
479
dmx/glxProxy: don't free the glx pixmap twice if AddResource fails
480
481
Reviewed-by: Rémi Cardona <remi@gentoo.org>
482
Signed-off-by: Julien Cristau <jcristau@debian.org>
483
(cherry picked from commit 164753f158e78f615f903467bfd234d7c58244ef)
484
485
commit dcbf88aea74a00a8e09ffdc4de2b555911eb90fb
486
Author: Julien Cristau <jcristau@debian.org>
487
Date: Mon Mar 7 23:20:28 2016 +0100
488
489
glx: don't call pGlxDraw->destroy() if AddResource fails
490
491
AddResource will have called DrawableGone, which takes care of the
492
destruction.
493
494
Reviewed-by: Rémi Cardona <remi@gentoo.org>
495
Signed-off-by: Julien Cristau <jcristau@debian.org>
496
(cherry picked from commit 59b9c3d5e4bf05aeaaac2ee4ea12c301a67aae2c)
497
498
commit ab197ee9478a0e4e7a276c03645657b4f22ae9c0
499
Author: Julien Cristau <jcristau@debian.org>
500
Date: Mon Mar 7 23:20:26 2016 +0100
501
502
xvmc: Fix unchecked AddResource
503
504
Reviewed-by: Rémi Cardona <remi@gentoo.org>
505
Signed-off-by: Julien Cristau <jcristau@debian.org>
506
(cherry picked from commit 119d5c0e2f800737c949ef760c5fe25d963200bf)
507
508
commit bd022f03143723ac326b39d6e67853650aa1bf1d
509
Author: Jonas Ådahl <jadahl@gmail.com>
510
Date: Tue Mar 8 20:05:33 2016 +0800
511
512
xwayland: Correctly detect whether posix_fallocate exists
513
514
We had HAVE_POSIX_FALLOCATE checks, but no such macros were ever
515
defined anywhere. This commit makes it so that this macro is defined if
516
the posix_fallocate is detected during configure.
517
518
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
519
Reviewed-by: Julien Cristau <jcristau@debian.org>
520
(cherry picked from commit a2c3c34b44b866440a152511e682c98879ee13b7)
521
522
commit 23d9b2a566cdaeff71deae9c3a221ebf0cb5f550
523
Author: Julien Cristau <jcristau@debian.org>
524
Date: Tue Mar 1 21:39:01 2016 +0100
525
526
xv: fix double free in AddResource failure case
527
528
XvdiDestroyVideoNotifyList already frees the list if AddResource fails,
529
so don't do it twice. And set tpn->client to NULL explicitly to avoid
530
confusing uninitialized memory with a valid value.
531
532
Reviewed-by: Adam Jackson <ajax@redhat.com>
533
Signed-off-by: Julien Cristau <jcristau@debian.org>
534
(cherry picked from commit 939ce0bae68b682b57675f65c901653c1a094ebb)
535
536
commit 90b854b2acc58a9936e9810f58b0bd1973697210
537
Author: Adam Jackson <ajax@redhat.com>
538
Date: Tue Mar 1 14:09:30 2016 -0500
539
540
dri1: Fix unchecked AddResource
541
542
Signed-off-by: Adam Jackson <ajax@redhat.com>
543
Reviewed-by: Julien Cristau <jcristau@debian.org>
544
(cherry picked from commit 05e1bcf56e1c511a1ef539acfe11e37727e1179e)
545
546
commit 0e3cc3d042a2da1ed781f6691dd7aca72d87046b
547
Author: Adam Jackson <ajax@redhat.com>
548
Date: Tue Mar 1 14:09:29 2016 -0500
549
550
xv: Fix unchecked AddResource
551
552
Reviewed-by: Julien Cristau <jcristau@debian.org>
553
Signed-off-by: Adam Jackson <ajax@redhat.com>
554
(cherry picked from commit 093f9505c12565cc19bdf6e33b263f31d104c3ef)
555
556
commit 3d7bfe02cc3ad0f16403a073f1182d7019c98be3
557
Author: Olivier Fourdan <ofourdan@redhat.com>
558
Date: Tue Mar 1 17:03:44 2016 +0100
559
560
vidmode: build without xf86vidmodeproto
561
562
git commit f175cf45:
563
564
vidmode: move to a separate library of its own
565
566
introduced a regression where the xserver would not build when
567
xf86vidmodeproto is not installed even if the configure option
568
"--disable-xf86vidmode" is specified.
569
570
Fix build failure when xf86vidmodeproto is not installed.
571
572
Reviewed-by: Adam Jackson <ajax@redhat.com>
573
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
574
(cherry picked from commit ac4d8c7cee13947b688ebb26035f06f7744db201)
575
576
commit a49e7b9c2ebeb2e2ccb922265798234a8ce9d242
577
Author: Olivier Fourdan <ofourdan@redhat.com>
578
Date: Mon Feb 8 17:48:26 2016 +0100
579
580
xwayland: fix a crash on output removal
581
582
On output removal, the CRTC that was added in xwl_output_create()
583
is not removed in xwl_output_destroy() and would cause a segmentation
584
fault later on in ProcRRGetMonitors():
585
586
(EE) Segmentation fault at address 0x100000001
587
(EE)
588
(EE) 10: ? (?+0x29) [0x29]
589
(EE) 9: /usr/bin/Xwayland (_start+0x29) [0x423299]
590
(EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7fdd80e7f580]
591
(EE) 7: /usr/bin/Xwayland (dix_main+0x3b3) [0x544ef3]
592
(EE) 6: /usr/bin/Xwayland (Dispatch+0x31e) [0x54109e]
593
(EE) 5: /usr/bin/Xwayland (ProcRRGetMonitors+0x9b) [0x4ca18b]
594
(EE) 4: /usr/bin/Xwayland (RRMonitorMakeList+0x269) [0x4c9ba9]
595
(EE) 3: /usr/bin/Xwayland (RRMonitorSetFromServer+0x118) [0x4c9198]
596
(EE) 2: /usr/bin/Xwayland (MakeAtom+0x30) [0x530710]
597
(EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7fdd80e93b1f]
598
(EE) 0: /usr/bin/Xwayland (OsSigHandler+0x29) [0x5792d9]
599
600
Remove the output CRTC in xwl_output_destroy() to avoid the crash.
601
602
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
603
Reviewed-by: Daniel Stone <daniels@collabora.com>
604
(cherry picked from commit 2116f03be04240e961649ca750a7aa5438b8446c)
605
606
commit c7735f102aa9daa604f304f2e8a2131fcdd652e8
607
Author: Michel Dänzer <michel.daenzer@amd.com>
608
Date: Thu Feb 18 17:33:19 2016 +0900
609
610
present: Call present_restore_screen_pixmap from present_set_abort_flip
611
612
After present_set_abort_flip, the screen pixmap will be used for all
613
screen drawing, so we need to restore the current flip pixmap contents
614
to the screen pixmap here as well.
615
616
Improves flashing / stutter e.g. when something like a popup menu appears
617
on top of a flipping fullscreen window or when switching out of
618
fullscreen.
619
620
Note that this means present_set_abort_flip now relies on screen->root
621
being non-NULL, but that's already the case in other present code.
622
623
Reviewed-by: Keith Packard <keithp@keithp.com>
624
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
625
(cherry picked from commit 1bee4e254ca0305cb23e574b4c8b250d276ee998)
626
627
commit 05d9de4e9ac515176f41f9fd649935ae990d8fb3
628
Author: Michel Dänzer <michel.daenzer@amd.com>
629
Date: Thu Feb 18 17:20:45 2016 +0900
630
631
present: Factor code for restoring screen pixmap out of present_unflip (v2)
632
633
The following fix will use the refactored function.
634
635
The logic in the refactored function is slightly simplified, exploiting
636
the fact that this function is only ever called with a valid flip
637
pixmap.
638
639
v2: Assert that flip_pixmap is non-NULL instead of testing and bailing
640
on NULL, preserve test for flip_window being non-NULL before calling
641
present_set_tree_pixmap for it (Keith Packard)
642
643
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
644
Reviewed-by: Keith Packard <keithp@keithp.com>
645
(cherry picked from commit 4611e902c291b8a789f374cff3300f74645bc2b2)
646
647
commit 49b2a0fb0e6ae0793171b5dbfe517fe06647c06d
648
Author: Michel Dänzer <michel.daenzer@amd.com>
649
Date: Thu Feb 18 18:23:47 2016 +0900
650
651
present: Only update screen pixmap from flip pixmap once per unflip
652
653
present_unflip may be called several times from present_check_flip_window
654
during the same unflip. We can only copy to the screen pixmap the first
655
time, otherwise we may scribble over other windows. The flip pixmap
656
contents don't get updated after the first time anyway.
657
658
Fixes at least the following problems, which were introduced by commit
659
806470b9 ("present: Copy unflip contents back to the Screen Pixmap"):
660
661
On xfwm4 without compositing, run glxgears and put its window into
662
fullscreen mode to start flipping. While in fullscreen, open the xfwm4
663
window menu by pressing Alt-Space. The window menu was invisible most
664
of the time because it was getting scribbled over by a repeated unflip
665
copy.
666
667
When switching a flipping window out of fullscreen, a repeated unflip
668
copy could leave artifacts of the flip pixmap on the desktop.
669
670
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94325
671
672
Reviewed-by: Keith Packard <keithp@keithp.com>
673
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
674
(cherry picked from commit 72328e5eb98a3f27e1f0a0e17beae6db447bd87c)
675
676
commit d5b8bc69e2652d8b9b13065b6528d2e8b8188b57
677
Author: Michel Dänzer <michel.daenzer@amd.com>
678
Date: Tue Dec 8 12:52:17 2015 +0900
679
680
dri3: Refuse to work for remote clients (v2)
681
682
Prevents clients forwarded via SSH from hanging while waiting for the
683
reply from the DRI3Open request.
684
685
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261
686
687
v2: Return BadMatch instead of BadRequest (Keith Packard)
688
689
Reviewed-by: Keith Packard <keithp@keithp.com>
690
(cherry picked from commit 43eb5b6047c9b35c337e553ec054f08bdc835abb)
691
692
commit 15454c5d26b00931b2099ccc6da356a1e5b6f88c
693
Author: Olivier Fourdan <ofourdan@redhat.com>
694
Date: Wed Feb 10 09:35:39 2016 +0100
695
696
xwayland: add partial xvidmode extension support
697
698
Older games (mostly those based on SDL 1.x) rely on the XVidMode
699
extension and would refuse to run without.
700
701
Add a simple, limited and read-only xvidmode support that reports the
702
current mode used so that games that rely on xvidmode extension can run
703
on XWayland.
704
705
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
706
Reviewed-by: Adam Jackson <ajax@redhat.com>
707
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
708
(cherry picked from commit 6070a749d953951bacbfb149c5c36451293aad35)
709
710
commit f2b346f9ba86ba304baac5ed29f8caf3fefbdba0
711
Author: Olivier Fourdan <ofourdan@redhat.com>
712
Date: Fri Feb 5 09:48:25 2016 +0100
713
714
vidmode: remove redundant DIX function
715
716
The API signature of the DIX xf86VidModeGetGammaRampSize() is now
717
identical to the xf86cmap's xf86GetGammaRampSize() and all it does is
718
actually call xf86GetGammaRampSize() so we can save one vfunc.
719
720
Remove uneeded xf86VidModeGetGammaRampSize() function.
721
722
Reviewed-by: Adam Jackson <ajax@redhat.com>
723
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
724
(cherry picked from commit b430f53bb753f9b064ab62d014820c1c3c76a841)
725
726
commit d381d59e44f675d01ca9ecab5a58c4864ae56c29
727
Author: Olivier Fourdan <ofourdan@redhat.com>
728
Date: Fri Feb 5 09:48:24 2016 +0100
729
730
vidmode: remove redundant check
731
732
The DIX already checks for VidModePrivateKey to get the vfunc, so
733
checking for this again in the DDX is redundant.
734
735
Remove the redundant function xf86VidModeAvailable() from the DDX.
736
737
Reviewed-by: Adam Jackson <ajax@redhat.com>
738
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
739
(cherry picked from commit 48fccde2bfb60efdbf45a96fa53bcd9a6570bf89)
740
741
commit 349b71a37e4a87e3650b5c0df9651b2ce967293e
742
Author: Olivier Fourdan <ofourdan@redhat.com>
743
Date: Wed Feb 10 09:34:34 2016 +0100
744
745
vidmode: move to a separate library of its own
746
747
XVidMode extension might be useful to non hardware servers as well (e.g.
748
Xwayand) so that applications that rely on it (e.g. lot of older games)
749
can at least have read access to XVidMode.
750
751
But the implementation is very XFree86 centric, so the idea is to add
752
a bunch of vfunc that other non-XFree86 servers can hook up into to
753
provide a similar functionality.
754
755
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
756
Reviewed-by: Adam Jackson <ajax@redhat.com>
757
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
758
(cherry picked from commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92)
759
760
commit 860669b1867178fe46df9da98591ea5a47f427f1
761
Author: Olivier Fourdan <ofourdan@redhat.com>
762
Date: Fri Feb 5 09:48:22 2016 +0100
763
764
vidmode: rename DDX functions
765
766
To avoid confusion as to what belongs on the DDX and what not.
767
768
Reviewed-by: Adam Jackson <ajax@redhat.com>
769
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
770
(cherry picked from commit 17097e083b2392c8989474f6e0da8cc234329e9c)
771
772
commit 64053645cfd950bb0b6c3fda8deb60e1e540ce69
773
Author: Olivier Fourdan <ofourdan@redhat.com>
774
Date: Fri Feb 5 09:48:21 2016 +0100
775
776
vidmode: move display mode definitions
777
778
To be able to reuse the VidMode extension in a non-hardware server, the
779
display mode definitions need to be accessible from DIX.
780
781
Reviewed-by: Adam Jackson <ajax@redhat.com>
782
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
783
(cherry picked from commit ddfb8c009ac651209eb0087aaf86b54e1446e8b2)
784
785
commit 227b533bf414e03e9a73d0d9e47a761fc597c360
786
Author: Olivier Fourdan <ofourdan@redhat.com>
787
Date: Fri Feb 5 09:48:20 2016 +0100
788
789
vidmode: remove mode access from public API
790
791
The mode access functions (namely VidModeCreateMode(),
792
VidModeCopyMode(), VidModeGetModeValue() and VidModeSetModeValue()) are
793
used only in xf86VidMode code and do not need to be available anywhere
794
else.
795
796
Remove these functions from the public VidMode API and move them as
797
static where they are used.
798
799
Reviewed-by: Adam Jackson <ajax@redhat.com>
800
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
801
(cherry picked from commit e29a64de662112b8ebcd3f20c89df0e8c51890ef)
802
803
commit 9824faaa58efe55a372d7dd0f6c5cbf84e77af61
804
Author: Olivier Fourdan <ofourdan@redhat.com>
805
Date: Fri Feb 5 09:48:19 2016 +0100
806
807
vidmode: use appropriate DisplayModePtr type
808
809
The API uses an untyped pointer (void *) where a DisplayModePtr is
810
expected.
811
812
Clean up the API to use the appropriate type, as DisplayModePtr is
813
really all that will be passed there.
814
815
Reviewed-by: Adam Jackson <ajax@redhat.com>
816
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
817
(cherry picked from commit b7962ade5265a21ac7c60da6cc07ece15ef7e648)
818
819
commit 3b52aee6dddc2cd2780f729e9389a1515c544c61
820
Author: Olivier Fourdan <ofourdan@redhat.com>
821
Date: Fri Feb 5 09:48:18 2016 +0100
822
823
vidmode: remove VidModeGetMonitor()
824
825
VidModeGetMonitor() is used solely in ProcXF86VidModeGetMonitor() to
826
get a untyped monitor pointer that is passed back straight again to
827
VidModeGetMonitorValue().
828
829
This is actually useless as VidModeGetMonitorValue() could as well get
830
the monitor from the ScreenPtr just like VidModeGetMonitor() does.
831
832
Reviewed-by: Adam Jackson <ajax@redhat.com>
833
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
834
(cherry picked from commit 12f714fd95dc9d912c0bf2524005a73ec6e8ee4f)
835
836
commit b241fd6413775f76a5faaea0f685a8294322e2fc
837
Author: Olivier Fourdan <ofourdan@redhat.com>
838
Date: Fri Feb 5 09:48:17 2016 +0100
839
840
vidmode: use ScreenPtr instead of screen index
841
842
New code passes ScreenPtr instead of the screen index.
843
844
Change the VidMode functions to take a ScreenPtr.
845
846
Reviewed-by: Adam Jackson <ajax@redhat.com>
847
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
848
(cherry picked from commit f6f7e21133c13c34f306a191137d566e83b40929)
849
850
commit 2028b9066ddbbeaf585e154d19c2672cccdda9bb
851
Author: Olivier Fourdan <ofourdan@redhat.com>
852
Date: Fri Feb 5 09:48:16 2016 +0100
853
854
vidmode: get rid of the CloseScreen wrapper
855
856
As we rely on dixRegisterPrivateKey() to allocate the memory for us that
857
will be free automatically, we do not need the CloseScreen wrapper
858
anymore.
859
860
Reviewed-by: Adam Jackson <ajax@redhat.com>
861
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
862
(cherry picked from commit 6e898ef080df93e885ead9d6fee8854b34e0216f)
863
864
commit cb3a8768db1b7b2f98f62e3075aa0dd2a46edd9d
865
Author: Olivier Fourdan <ofourdan@redhat.com>
866
Date: Fri Feb 5 09:48:15 2016 +0100
867
868
vidmode: use appropriate API
869
870
dixRegisterPrivateKey() can allocate memory that will be freed when the
871
screen is teared down.
872
873
No need to calloc() and free the memory ourself using a broken ref
874
counting method.
875
876
Reviewed-by: Adam Jackson <ajax@redhat.com>
877
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
878
(cherry picked from commit 341f3bccafde71754a9ed2303df9908e509c6d31)
879
880
commit 45d17e6bb0ee35662913cd6ce378460aa7e461cc
881
Author: Chris Wilson <chris@chris-wilson.co.uk>
882
Date: Fri Feb 12 11:59:53 2016 +0000
883
884
dri2: Allow many blocked clients per-drawable
885
886
This patch was motivated by the need to fix the use-after-free in
887
dri2ClientWake, but in doing so removes an arbitrary restriction that
888
limits DRI2 to only blocking the first client on each drawable. In order
889
to fix the use-after-free, we need to avoid touching our privates in the
890
ClientSleep callback and so we want to only use that external list as
891
our means of controlling sleeps and wakeups. We thus have a list of
892
sleeping clients at our disposal and can manage multiple events and
893
sources.
894
895
Reviewed-by: Adam Jackson <ajax@redhat.com>
896
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
897
(cherry picked from commit d8882954570aba656d5a7be7d357feaba21cb099)
898
899
commit 204e85786f24c1ab734ab9ee015efbb790dee130
900
Author: Chris Wilson <chris@chris-wilson.co.uk>
901
Date: Fri Feb 12 11:59:52 2016 +0000
902
903
dix: Add ClientSignalAll()
904
905
This is a variant of ClientSignal() that signals all clients with an
906
optional matching sleeping client, function and closure.
907
908
Reviewed-by: Adam Jackson <ajax@redhat.com>
909
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
910
(cherry picked from commit bc3634010c096dffd1935c0c6cf8ba37534ae3d8)
911
912
commit c06a4b4a2422e937eda36a4ec10bdafc71001be7
913
Author: Jon Turney <jon.turney@dronecode.org.uk>
914
Date: Tue Aug 11 15:45:57 2015 +0100
915
916
xwin: Add SKIPTASKBAR hint to _NET_WM_WINDOW_TYPE_DOCK type windows
917
918
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
919
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
920
(cherry picked from commit f7d1e5acdf5ed4ab4ed5c18727aa6f3d379ef560)
921
922
commit 6f099c7bd59039834c7b45289310b003b81cb3e3
923
Author: Jon Turney <jon.turney@dronecode.org.uk>
924
Date: Thu Jul 2 19:21:11 2015 +0100
925
926
xwin: In multiwindow mode, look up the HWND for the parent window
927
928
Rather than only looking at the foreground window to see if it matches
929
the WM_TRANSIENT_FOR window XID, lookup that XID and fetch the HWND from
930
the window privates.
931
932
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
933
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
934
(cherry picked from commit e7f87f8f76e5ac9479a71e3daf2cfdefd4b5f684)
935
936
commit 41cbb7da4e9337d4136d378f5fa45365f41f02e4
937
Author: Jon Turney <jon.turney@dronecode.org.uk>
938
Date: Mon Feb 22 17:41:14 2016 +0000
939
940
xwin: Keyboard layout updates
941
942
layout zh_TW doesn't exist (anymore), try something else for that.
943
944
layout it variant mac doesn't seem to exist anymore, try to handle
945
Macintosh keyboards (running under Parallels on Mac) and other oddities
946
in a more generic way, by falling back to matching only on the language
947
identifer part of the input locale identifer.
948
949
v2:
950
Fix typo of 0xa0000 for 0xa000
951
952
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
953
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
954
(cherry picked from commit 8c2006ddc5abbd4ac374dabf1cfdd3df8fc88779)
955
956
commit da7745065ee27d62cc2eba4e860118459917dad9
957
Author: Colin Harrison <colin.harrison@virgin.net>
958
Date: Wed Nov 19 22:33:39 2014 +0000
959
960
xwin: Add a tentative entry for the Korean keyboard to the list of known keyboard layouts
961
962
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
963
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
964
(cherry picked from commit 8c97a0078e7fe22e6159fa53490dfca2f4d267a9)
965
966
commit c1eb12f89c2391cd99a834da6b342f104da1eb5c
967
Author: Jon Turney <jon.turney@dronecode.org.uk>
968
Date: Tue Feb 10 14:36:37 2015 +0000
969
970
xwin: Update to XRANDR 1.2 internal interface to ensure an output is reported by XRANDR
971
972
If using the X server internal XRANDR 1.0 interface, it seems we must
973
register a display size with RRRegisterSize() in order to make
974
RRGetInfo() call RRScanOldConfig() to generate an output and crtc for
975
us.
976
977
Without this, the following GDM bug means that an XDMCP session to GDM
978
cannot be started.
979
980
https://bugzilla.gnome.org/show_bug.cgi?id=736054
981
982
Instead, use the more recent XRANDR 1.2 internal interface to explicitly
983
create the output and crtc, and maintain a single mode which represents
984
the current display size.
985
986
Also don't emit a RRScreenSizeNotify when a RRScreenSizeSize is done
987
which has no effect, this seems to throw the GDM greeter into a loop...
988
989
v2: Maintain reference count for the mode we maintain more correctly, to
990
avoid double free causing a crash on shutdown
991
992
Connect crtc to output, so a subsequent RRSetCrtcConfig request doesn't
993
change anything, so we don't fail due to our lack of rrSetConfig or
994
rrCrtcSet hooks.
995
996
See https://cygwin.com/ml/cygwin-xfree/2015-02/msg00032.html
997
998
v3:
999
Raise limit on X display size from 4Kx4K to 32Kx32K
1000
1001
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1002
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1003
(cherry picked from commit a4d8a64c4ba467964476c4a1486da698bd6aed9e)
1004
1005
commit 771a668188793e7261ae2cbf7d7289b8a133316a
1006
Author: Jon Turney <jon.turney@dronecode.org.uk>
1007
Date: Sat Oct 18 17:31:57 2014 +0100
1008
1009
xwin: Use WM_CLIPBOARDUPDATE clipboard API
1010
1011
Windows Vista and later have a saner clipboard API where the clipboard
1012
viewer linked list is no longer maintained by applications. Use it
1013
where available.
1014
1015
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1016
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1017
(cherry picked from commit 008efebda801b9b80e2ab3f2c95aeef8c82102ee)
1018
1019
commit 00199e8c822fcf6a933637410e44e08ac659f682
1020
Author: Jon Turney <jon.turney@dronecode.org.uk>
1021
Date: Wed Jul 9 14:26:54 2014 +0100
1022
1023
xwin: Check that window position is visible on non-rectangular virtual desktops
1024
1025
Improve the check that window position is visible to work correctly for
1026
non-rectangular virtual desktops
1027
1028
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1029
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1030
(cherry picked from commit de7f1fd6f8f10f07b366ae5428a8c65a224bda98)
1031
1032
commit 0fb47bd27919a7f1e47db3bd3f97fd9a07ccc517
1033
Author: Jon Turney <jon.turney@dronecode.org.uk>
1034
Date: Thu May 8 11:40:39 2014 +0100
1035
1036
xwin: Correctly interpret WM_HINTS, WM_NORMAL_HINTS properties on x86_64
1037
1038
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1039
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1040
(cherry picked from commit a9e73131b6453e0fa2da5360e84af7a2eae3b205)
1041
1042
commit 1e143cff16835dd69559ca5646f313dad3db75ab
1043
Author: Jon Turney <jon.turney@dronecode.org.uk>
1044
Date: Thu Mar 13 18:04:17 2014 +0000
1045
1046
xwin: Improve handling of no-decoration motif hint
1047
1048
When motif decoration hint asks for no decoration, don't add sysmenu,
1049
mimimize or maximimize controls.
1050
1051
(This fixes a problem with e.g. fbpanel having a minimize control, but
1052
gtk's panel_configure_event() doesn't like the state we put the window
1053
into when we minimize it, causing it to spin)
1054
1055
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1056
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1057
(cherry picked from commit d7cef6fbe23381b31c163468f349feee2f1b1eba)
1058
1059
commit f0c2a3527797cf2bfbfa4697c294ae087c1e4423
1060
Author: Jon Turney <jon.turney@dronecode.org.uk>
1061
Date: Fri Mar 28 16:57:48 2014 +0000
1062
1063
xwin: XGetWMNormalHints() returns non-zero on success
1064
1065
XGetWMNormalHints() doesn't actually return a Status value. On success
1066
it returns a non-zero value, not Success.
1067
1068
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1069
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
1070
(cherry picked from commit f75404be3ad94c8da493688397712c65ea66cb90)
1071
1072
commit e457e93e5d33cbec387e40051fbabf6cf76d6af3
1073
Author: Michel Dänzer <michel.daenzer@amd.com>
1074
Date: Wed Feb 24 16:52:59 2016 +0900
1075
1076
present: Only requeue if target MSC is not reached after an unflip
1077
1078
While present_pixmap decrements target_msc by 1 for present_queue_vblank,
1079
it leaves the original vblank->target_msc intact. So incrementing the
1080
latter for requeueing resulted in the requeued presentation being
1081
executed too late.
1082
1083
Also, no need to requeue if the target MSC is already reached.
1084
1085
This further reduces stutter when a popup menu appears on top of a
1086
flipping fullscreen window.
1087
1088
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
1089
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
1090
(cherry picked from commit b4ac7b142fa3c536e9b283cfd34b94d82c03aac6)
1091
1092
commit eb5108b87017128f394ae31b5b7cd85dd8819bca
1093
Author: Michel Dänzer <michel.daenzer@amd.com>
1094
Date: Wed Feb 24 16:52:58 2016 +0900
1095
1096
present: Requeue if flip driver hook fails and target MSC not reached
1097
1098
For flipping, we wait for the MSC before the target MSC and then call
1099
the driver flip hook. If the latter fails, we have to wait for the
1100
target MSC before falling back to a copy, or else it's executed too
1101
early.
1102
1103
Fixes glxgears running at unbounded framerate (not synchronized to the
1104
refresh rate) in fullscreen if the driver flip hook fails.
1105
1106
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
1107
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
1108
(cherry picked from commit e7a35b9e16aa12970908f5d55371bb1b862f8f24)
1109
1110
commit cf30b7cfd6d91da16c762332617fc165d82f17d2
1111
Author: Michel Dänzer <michel.daenzer@amd.com>
1112
Date: Wed Feb 24 16:52:57 2016 +0900
1113
1114
present: Move msc_is_(equal_or_)after to the top of present.c
1115
1116
To make them usable from any other function in the file. No functional
1117
change.
1118
1119
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
1120
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
1121
(cherry picked from commit 1a9f8c4623c4e6b6955cb6d5f44d29c244dfd32a)
1122
1123
commit 8869f45a965a7b12bb7fe03ba226167e1f821c1e
1124
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
1125
Date: Mon Feb 22 16:04:12 2016 -0300
1126
1127
kdrive/evdev: update keyboard LEDs (#22302)
1128
1129
Implement missing parts in kdrive evdev driver for
1130
correct update of evdev keyboard LEDs.
1131
1132
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22302
1133
1134
[ajax: Fixed deref-before-null-check bug]
1135
1136
Reviewed-by: Adam Jackson <ajax@redhat.com>
1137
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
1138
(cherry picked from commit 0461bca0cb2f7918c77ed45d2cbc756cf65021be)
1139
1140
commit 05f3cf659be44caf00e801a5bcd9362a1a87aa46
1141
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
1142
Date: Mon Feb 22 16:20:00 2016 +0000
1143
1144
Fix build on Cygwin by ensuring WIN32 check triggers only on MinGW
1145
1146
The type of fd_mask was changed in Cygwin 2.4.0 headers from 'long' to
1147
'unsigned long'. This exposes an existing problem with winauth.c, which
1148
includes Xwindows.h (which includes windows.h, which defines WIN32),
1149
before including osdep.h, which causes the now conflicting definition of
1150
fd_mask in osdep.h to be exposed:
1151
1152
In file included from ../os/osdep.h:198:18: error: conflicting types for
1153
‘fd_mask’ typedef long int fd_mask; /usr/include/sys/select.h:46:23:
1154
note: previous declaration of ‘fd_mask’ was here typedef unsigned long
1155
fd_mask;
1156
1157
Adjust the include guards in osdep.h to make sure we only use WIN32
1158
guarded code when not compiling for Cygwin (i.e. WIN32 && !__CYGWIN__)
1159
1160
This isn't a very elegant, but unfortunately appears to be the best
1161
solution, since it doesn't seem to be possible to write the test in a
1162
positive form.
1163
1164
Future work: Should also audit of all the other uses of WIN32 in
1165
xserver, and make sure they are correct.
1166
1167
Reviewed-by: Adam Jackson <ajax@redhat.com>
1168
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
1169
(cherry picked from commit 30b7d7995ef70b7473e0fb170eb8ae23b8d1f4a7)
1170
1171
commit 10e46504711427ed5280fdeb974a08b888f47034
1172
Author: Jonas Ådahl <jadahl@gmail.com>
1173
Date: Fri Feb 19 15:08:12 2016 +0800
1174
1175
xwayland: Prefix shm tmp file names with xwayland
1176
1177
Prefix the temporary file names used for allocating pixmaps with
1178
"xwayland-" instead of "weston-". This makes it less confusing while
1179
looking at the file names of the currently open fds of the Xwayland
1180
process.
1181
1182
Reviewed-by: Adam Jackson <ajax@redhat.com>
1183
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
1184
(cherry picked from commit 544b4149268561d3d794aa540172831fa7550a20)
1185
1186
commit de7f91c079d7168c107bb8b8dbe651eebd8e9a12
1187
Author: Marc-Andre Lureau <marcandre.lureau@gmail.com>
1188
Date: Fri Feb 12 22:52:07 2016 +0100
1189
1190
dri2: add virtio-gpu pci ids
1191
1192
Add virtio-gpu legacy + 1.0 pci ids, allowing them to use
1193
modesetting + glamor with dri2.
1194
1195
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
1196
Reviewed-by: Dave Airlie <airlied@redhat.com>
1197
(cherry picked from commit 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0)
1198
1199
commit 16573a4c35cb71f204b37ad1c3b3d115e84b2cd8
1200
Author: Daniel Stone <daniels@collabora.com>
1201
Date: Fri Feb 12 16:36:59 2016 +0000
1202
1203
dix: Add hybrid full-size/empty-clip mode to SetRootClip
1204
1205
216bdbc735 removed the SetRootClip call in the XWayland output-hotplug
1206
handler when running rootless (e.g. as a part of Weston/Mutter), since
1207
the root window has no storage, so generating exposures will result in
1208
writes to invalid memory.
1209
1210
Unfortunately, preventing the segfault also breaks sprite confinement.
1211
SetRootClip updates winSize and borderSize for the root window, which
1212
when combined with RRScreenSizeChanged calling ScreenRestructured,
1213
generates a new sprite-confinment area to update it to the whole screen.
1214
1215
Removing this call results in the window geometry being reported
1216
correctly, but winSize/borderSize never changing from their values at
1217
startup, i.e. out of sync with the root window geometry / screen
1218
information in the connection info / XRandR.
1219
1220
This patch introduces a hybrid mode, where we update winSize and
1221
borderSize for the root window, enabling sprite confinement to work
1222
correctly, but keep the clip emptied so exposures are never generated.
1223
1224
Signed-off-by: Daniel Stone <daniels@collabora.com>
1225
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
1226
Reviewed-by: Adam Jackson <ajax@redhat.com>
1227
(cherry picked from commit e957a2e5dd288f515f3e93724823542c20333f6a)
1228
1229
commit 29d1c5a8e4127d5fd1a0d41f8e1474e9dfdb9638
1230
Author: Keith Packard <keithp@keithp.com>
1231
Date: Tue Feb 16 20:03:57 2016 -0800
1232
1233
randr: Send ConfigNotify when manual monitor list changes
1234
1235
This lets clients know that the layout of the monitors on the screen
1236
has changed so they can adapt appropriately.
1237
1238
Signed-off-by: Keith Packard <keithp@keithp.com>
1239
Reviewed-by: Dave Airlie <airlied@redhat.com>
1240
(cherry picked from commit dbe8d03c42f01332b3dc41fe9290aed142f1436f)
1241
1242
commit fc3eef6024355206ea429eb5e2d36001fa47a884
1243
Author: Adam Jackson <ajax@redhat.com>
1244
Date: Wed Feb 10 11:13:04 2016 -0500
1245
1246
dri2: Use the work queue to manage client sleeps
1247
1248
In commit e43abdce964f5ed9689cf908af8c305b39a5dd36
1249
Author: Chris Wilson <chris@chris-wilson.co.uk>
1250
Date: Wed Feb 3 09:54:46 2016 +0000
1251
1252
dri2: Unblock Clients on Drawable release
1253
1254
we try to wake up any blocked clients at drawable destruction. But by
1255
the time we get there, CloseDownConnection has already torn down state
1256
that AttendClient wants to modify.
1257
1258
Using ClientSleep instead of IgnoreClient puts a wakeup function on a
1259
workqueue, and the queue will be cleared for us in CloseDownClient
1260
before (non-neverretain) resource teardown.
1261
1262
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
1263
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
1264
Signed-off-by: Adam Jackson <ajax@redhat.com>
1265
(cherry picked from commit eddf848c44349c7ebc7da9957bffb3630f3faaa9)
1266
1267
commit 9db37e05a96d1488b7cb30b7e1ccd4c73b38d915
1268
Author: Chris Wilson <chris@chris-wilson.co.uk>
1269
Date: Wed Feb 3 09:54:46 2016 +0000
1270
1271
dri2: Unblock Clients on Drawable release
1272
1273
If the Window is destroyed by another client, such as the window
1274
manager, the original client may be blocked by DRI2 awaiting a vblank
1275
event. When this happens, DRI2DrawableGone forgets to unblock that
1276
client and so the wait never completes.
1277
1278
Note Present/xshmfence is also suspectible to this race.
1279
1280
Testcase: dri2-race/manager
1281
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
1282
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
1283
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
1284
(cherry picked from commit e43abdce964f5ed9689cf908af8c305b39a5dd36)
1285
1286
commit 7be0e08cd91ed4be18eefb04018be36dcf0f427e
1287
Author: Adam Jackson <ajax@redhat.com>
1288
Date: Wed Dec 9 09:10:13 2015 -0500
1289
1290
autogen: Set a default subject prefix for patches
1291
1292
Per discussion at XDC2015, we want this so we can easily distinguish
1293
which module a patch is for. There's no way to set this in the
1294
server-side config, so setting a default at autogen time is about the
1295
best we can do.
1296
1297
Reviewed-by: Eric Anholt <eric@anholt.net>
1298
Signed-off-by: Adam Jackson <ajax@redhat.com>
1299
(cherry picked from commit a722d617a092f08f69086630f5cfb598d4a21cc7)
1300
1301
commit c388b2d52177eb7f66a63a8454cee1990b4813d9
1302
Author: Jan Burgmeier <jan.burgmeier@unicon-software.com>
1303
Date: Thu Feb 4 14:06:43 2016 +0100
1304
1305
Fix XineramaQueryScreens for reverse prime
1306
1307
Make sure we account for slave CRTCs when building the monitor list,
1308
since that's what rrxinerama uses to fake Xinerama geometry.
1309
1310
[ajax: Slightly more informative commit message.]
1311
1312
Bugzilla: https://bugs.freedesktop.org/92313
1313
Reviewed-by: Dave Airlie <airlied@redhat.com>
1314
(cherry picked from commit 7bb64d8c1de9659f11da7917772919b071e9db82)
1315
1316
commit 18155405875608f3a46db465aa9753d66b099f8e
1317
Author: Rui Matos <tiagomatos@gmail.com>
1318
Date: Wed Feb 3 16:14:09 2016 +0100
1319
1320
xwayland: Clear pending cursor frame callbacks on pointer enter
1321
1322
The last cursor frame we commited before the pointer left one of our
1323
surfaces might not have been shown. In that case we'll have a cursor
1324
surface frame callback pending which we need to clear so that we can
1325
continue submitting new cursor frames.
1326
1327
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
1328
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
1329
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
1330
Reviewed-by: Daniel Stone <daniels@collabora.com>
1331
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
1332
(cherry picked from commit 87d5534f701242d7c23aa20545a6292a0779c89c)
1333
1334
commit eac170e469cb66a7e5a47d00c56ddc53c63cca85
1335
Author: Chris Wilson <chris@chris-wilson.co.uk>
1336
Date: Wed Feb 3 09:54:43 2016 +0000
1337
1338
dri2: Only invalidate the immediate Window upon SetWindowPixmap
1339
1340
All callers of SetWindowPixmap will themselves be traversing the Window
1341
heirarchy updating the backing Pixmap of each child and so we can forgo
1342
doing the identical traversal inside the DRI2SetWindowPixmap handler.
1343
1344
Reported-by: Loïc Yhuel <loic.yhuel@gmail.com>
1345
Link: http://lists.x.org/archives/xorg-devel/2015-February/045638.html
1346
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
1347
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
1348
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
1349
(cherry picked from commit b7d392931a309d0fe754869efb456ccd0385f3aa)
1350
1351
commit 2fc1752ac39a9325dbc5f8e700fc566ea6f8240f
1352
Author: Eric Anholt <eric@anholt.net>
1353
Date: Wed Jan 27 11:26:16 2016 -0800
1354
1355
glamor: Flip around conditionals in RepeatNone fixups.
1356
1357
Signed-off-by: Eric Anholt <eric@anholt.net>
1358
Reviewed-by: Dave Airlie <airlied@redhat.com>
1359
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1360
(cherry picked from commit 2c3e8768443caa66d78775ea79bb16a5faae3a3c)
1361
1362
commit 4acebf257e37e075a14b3acecce27d050b18bba8
1363
Author: Eric Anholt <eric@anholt.net>
1364
Date: Wed Jan 27 11:21:05 2016 -0800
1365
1366
glamor: Cut down a bunch of conditional handling for RepeatFix.
1367
1368
For hardware that doesn't do actual jumps for conditionals (i915,
1369
current vc4 driver), this reduces the number of texture fetches
1370
performed (assuming the driver isn't really smart about noticing that
1371
the same sampler is used on each side of an if just with different
1372
coordinates).
1373
1374
No performance difference on i965 with x11perf -magpixwin100 (n=40).
1375
Improves -magpixwin100 by 12.9174% +/- 0.405272% (n=5) on vc4.
1376
1377
Signed-off-by: Eric Anholt <eric@anholt.net>
1378
Reviewed-by: Dave Airlie <airlied@redhat.com>
1379
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1380
(cherry picked from commit e82c8c81df80de487aa795d69e874a0811c537ea)
1381
1382
commit d1c0873228a115ee0ebf46afaf335b8b97a5bbdc
1383
Author: Eric Anholt <eric@anholt.net>
1384
Date: Wed Jan 27 11:15:27 2016 -0800
1385
1386
glamor: Clarify how the repeat values being passed around work.
1387
1388
Signed-off-by: Eric Anholt <eric@anholt.net>
1389
Reviewed-by: Dave Airlie <airlied@redhat.com>
1390
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1391
(cherry picked from commit 2c3273861cdf874b165ce5a1953102187f71b48e)
1392
1393
commit b0b160aafc151b1fdf1840134bc344e3ce2f3e85
1394
Author: Eric Anholt <eric@anholt.net>
1395
Date: Wed Jan 27 11:10:14 2016 -0800
1396
1397
glamor: Clean up formatting of RepeatFix shader code.
1398
1399
All sorts of weird indentation, and some cuddled conditional
1400
statements deep in the if tree.
1401
1402
Signed-off-by: Eric Anholt <eric@anholt.net>
1403
Reviewed-by: Dave Airlie <airlied@redhat.com>
1404
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1405
(cherry picked from commit 990a8ee01324332ee9b4a4bb124ce8f73be24349)
1406
1407
commit 12e4e3ac31b05b501df74c4fa37274830e30662a
1408
Author: Eric Anholt <eric@anholt.net>
1409
Date: Wed Jan 27 10:24:17 2016 -0800
1410
1411
glamor: Clarify some logic in RepeatFix handling.
1412
1413
wh ratios are != 1.0 only when large, so with that we can simplify
1414
down how we end up with RepeatFix being used.
1415
1416
Signed-off-by: Eric Anholt <eric@anholt.net>
1417
Reviewed-by: Dave Airlie <airlied@redhat.com>
1418
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1419
(cherry picked from commit 20cb5b2d65ce63ea7934b77f1520387550c778a8)
1420
1421
commit d5c9c541c5d325453ddb9ebcdcf36bc6ef0af4aa
1422
Author: Eric Anholt <eric@anholt.net>
1423
Date: Tue Jan 26 17:29:48 2016 -0800
1424
1425
glamor: Simplify the pixmap box looping.
1426
1427
We had a double loop across h and w, and passed the current x and y
1428
out to callers who then used w to multiply/add to an index. Instead,
1429
just single loop across w * h.
1430
1431
Signed-off-by: Eric Anholt <eric@anholt.net>
1432
Reviewed-by: Dave Airlie <airlied@redhat.com>
1433
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1434
(cherry picked from commit 07f0d90e4a8b05ef968b1ef47acda7c9f4580340)
1435
1436
commit 68bd172432de069aa242d21b3af505867417ae45
1437
Author: Eric Anholt <eric@anholt.net>
1438
Date: Tue Jan 26 15:56:27 2016 -0800
1439
1440
glamor: Reuse the glamor_program_alpha_* enums for Render.
1441
1442
This is a step toward using glamor_program.c for Render acceleration.
1443
1444
Signed-off-by: Eric Anholt <eric@anholt.net>
1445
Reviewed-by: Dave Airlie <airlied@redhat.com>
1446
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1447
(cherry picked from commit 0dbce65b08f4812dcaa4b77cd37aebac334c47a2)
1448
1449
commit 6a71251b3985d6dd7c1ab1fa6e13f1edaa33a5c5
1450
Author: Eric Anholt <eric@anholt.net>
1451
Date: Tue Jan 26 15:47:01 2016 -0800
1452
1453
glamor: Drop extra SHADER_IN type for no mask present.
1454
1455
We can just hand in a constant mask and the driver will optimize away
1456
the multiplication for us.
1457
1458
Signed-off-by: Eric Anholt <eric@anholt.net>
1459
Reviewed-by: Dave Airlie <airlied@redhat.com>
1460
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1461
(cherry picked from commit 9b676786de32f06aedf9d4c9535c10fda247335a)
1462
1463
commit 2db5bf7a1297a84e516ce87b24dd3982e7674bb2
1464
Author: Eric Anholt <eric@anholt.net>
1465
Date: Tue Jan 26 15:19:50 2016 -0800
1466
1467
glamor: Convert XV to using glamor_program.c.
1468
1469
One less custom path! By following the common glamor_program.c use
1470
pattern, we get the ability to handle large pixmaps as the
1471
destination. It's also one less place where glamor_utils.h coordinate
1472
transformation happens.
1473
1474
Signed-off-by: Eric Anholt <eric@anholt.net>
1475
Reviewed-by: Dave Airlie <airlied@redhat.com>
1476
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1477
(cherry picked from commit 03f34f85563c81e1655626e10f75fd7e21393c92)
1478
1479
commit 9be8478467fc4827ca8edc035f0a6d1cca78fbe0
1480
Author: Eric Anholt <eric@anholt.net>
1481
Date: Tue Jan 26 14:52:08 2016 -0800
1482
1483
glamor: Simplify XV vertex setup.
1484
1485
We were clipping the drawn rectangle to each clip box, then expanding
1486
the box to a big triangle to avoid tearing, then drawing each triangle
1487
to the destination through a scissor. If we're using a scissor for
1488
clipping, though, then we don't need to clip the drawn primitive on
1489
the CPU in the first place.
1490
1491
Signed-off-by: Eric Anholt <eric@anholt.net>
1492
Reviewed-by: Dave Airlie <airlied@redhat.com>
1493
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1494
(cherry picked from commit f368a0ba3aa58e5260d839d11d2f3aef75feaeaf)
1495
1496
commit d23fe3229c17cb0dfb4210041efbdc36fc365dad
1497
Author: Eric Anholt <eric@anholt.net>
1498
Date: Tue Jan 26 14:18:48 2016 -0800
1499
1500
glamor: Set up XV sampler uniforms once at program build time.
1501
1502
No sense doing it on every draw.
1503
1504
Signed-off-by: Eric Anholt <eric@anholt.net>
1505
Reviewed-by: Dave Airlie <airlied@redhat.com>
1506
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1507
(cherry picked from commit 294e45b60d99cf7d11c657288bbe2670b56775f3)
1508
1509
commit ef993dbbed24f1fe68fd4c66f0035e6c74cde10d
1510
Author: Eric Anholt <eric@anholt.net>
1511
Date: Tue Jan 26 13:39:18 2016 -0800
1512
1513
glamor: Drop dead glamor_pict_format_is_compatible().
1514
1515
This hasn't been used since 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342
1516
(GLAMOR_SEPARATE_TEXTURE removal).
1517
1518
Signed-off-by: Eric Anholt <eric@anholt.net>
1519
Reviewed-by: Dave Airlie <airlied@redhat.com>
1520
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1521
(cherry picked from commit 5d7bef2eedfd965359dd4eebb6ab806cdad5b83f)
1522
1523
commit f031c5edbf36a029800d0f8574aea226a4b5b82f
1524
Author: Eric Anholt <eric@anholt.net>
1525
Date: Tue Jan 26 15:08:17 2016 -0800
1526
1527
glamor: Drop comment about dead yInverted flag.
1528
1529
Wait long enough, and you don't need to think about it at all.
1530
1531
Signed-off-by: Eric Anholt <eric@anholt.net>
1532
Reviewed-by: Dave Airlie <airlied@redhat.com>
1533
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1534
(cherry picked from commit 4494a450405cf539743cbcfe6907bf5bdd2d80cb)
1535
1536
commit f1a03379c44c467b92753748165380e33e2e28c8
1537
Author: Eric Anholt <eric@anholt.net>
1538
Date: Tue Jan 26 13:34:00 2016 -0800
1539
1540
glamor: Rename the *y_inverted helpers to not say "inverted".
1541
1542
Signed-off-by: Eric Anholt <eric@anholt.net>
1543
Reviewed-by: Dave Airlie <airlied@redhat.com>
1544
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1545
(cherry picked from commit f7c24e6ac345aab91df5fc959f239a33f37113b1)
1546
1547
commit 83395e6a99c0665490948c92da9bd768954f8c9e
1548
Author: Eric Anholt <eric@anholt.net>
1549
Date: Tue Jan 26 13:31:59 2016 -0800
1550
1551
glamor: Drop dead *_from_x_coord_y() functions.
1552
1553
They've been dead since the yInverted removal
1554
(e310387f443b6333edf02c8980daa303505382b4).
1555
1556
Signed-off-by: Eric Anholt <eric@anholt.net>
1557
Reviewed-by: Dave Airlie <airlied@redhat.com>
1558
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1559
(cherry picked from commit 1fcb6f4cbf3d6514716435a0e79c0e6d53c31a3a)
1560
1561
commit 558ea399664b767c3f9c1acc18f4b2d341d6929c
1562
Author: Eric Anholt <eric@anholt.net>
1563
Date: Thu Jan 21 16:01:14 2016 -0800
1564
1565
glamor: Clarify when Render fallbacks happen due to an unsupported op.
1566
1567
Signed-off-by: Eric Anholt <eric@anholt.net>
1568
Reviewed-by: Dave Airlie <airlied@redhat.com>
1569
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1570
(cherry picked from commit 9ef11f13af7f552dadb4a90c248e525a257e0a2c)
1571
1572
commit 7c63e80e3f9de3d1b8132a40be6f932e772e0d69
1573
Author: Eric Anholt <eric@anholt.net>
1574
Date: Wed Jan 27 11:35:03 2016 -0800
1575
1576
glamor: Label programs before linking them.
1577
1578
i965 does most of its compiling at link time, so our debug output for
1579
its shaders didn't have the name on.
1580
1581
Signed-off-by: Eric Anholt <eric@anholt.net>
1582
Reviewed-by: Dave Airlie <airlied@redhat.com>
1583
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1584
(cherry picked from commit b8229cc5f5298a37a4735dd002b0e0ebfc8bc75a)
1585
1586
commit 14e2b6f9d87921b39c0874e1a74dff2f9e396f78
1587
Author: Eric Anholt <eric@anholt.net>
1588
Date: Wed Jan 27 16:11:17 2016 -0800
1589
1590
ephyr: Make sure we have GLX_ARB_create_context before calling it.
1591
1592
This should fix aborts()s from epoxy on old software stacks.
1593
1594
Signed-off-by: Eric Anholt <eric@anholt.net>
1595
Reviewed-by: Dave Airlie <airlied@redhat.com>
1596
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
1597
(cherry picked from commit 68f236ebd4b268a9e525d623986999d230feb453)
1598
1599
commit cd9ae6d1a259f3229df4c110903658d1bede8554
1600
Author: Adam Jackson <ajax@redhat.com>
1601
Date: Tue Dec 8 17:41:37 2015 -0500
1602
1603
xfree86: Build parser for DRI config file subsection unconditionally
1604
1605
This applies regardless of which DRI you're asking for. Worse, leaving
1606
it out means breaking the config file syntax in a pointless way, since
1607
non-DRI servers can safely just parse it and ignore it.
1608
1609
Reviewed-by: Eric Anholt <eric@anholt.net>
1610
Signed-off-by: Adam Jackson <ajax@redhat.com>
1611
(cherry picked from commit 953b71270cf12c59c8a836c9be403d07fb01fa22)
1612
1613
commit 3da08902dd5961ea6f70431fce813f294d0f8547
1614
Author: Dave Airlie <airlied@redhat.com>
1615
Date: Wed Jan 27 16:46:06 2016 -0800
1616
1617
ephyr: catch X errors if we try to create a core context and fail.
1618
1619
This stops Xephyr failing on GLXBadFBConfig.
1620
1621
Signed-off-by: Dave Airlie <airlied@redhat.com>
1622
Reviewed-by: Dave Airlie <airlied@redhat.com>
1623
(cherry picked from commit d8ecbe563991cc689e95a8cb9d510e920eaceea0)
1624
1625
commit 4c6ca0aae5a301140eadc97313be954bd6a5fe18
1626
Author: Dave Airlie <airlied@redhat.com>
1627
Date: Tue Jan 19 08:06:25 2016 +1000
1628
1629
xwayland: add support for use core profile for glamor. (v2)
1630
1631
This adds support to Xwayland to try and use OpenGL core
1632
profile for glamor first.
1633
1634
v1.1: use version defines.
1635
v2: let glamor work out core profile itself.
1636
1637
Signed-off-by: Dave Airlie <airlied@redhat.com>
1638
Reviewed-by: Eric Anholt <eric@anholt.net>
1639
(cherry picked from commit 6978c8ee666a9224213173e7680e2d71b1094bab)
1640
1641
commit b0fa782081f933e84f068228ca35fa5c25c9a4b3
1642
Author: Dave Airlie <airlied@redhat.com>
1643
Date: Tue Jan 19 07:59:59 2016 +1000
1644
1645
glamor: add core profile support to EGL glamor. (v2)
1646
1647
v1.1: use version defines.
1648
v2: let glamor work it out itself
1649
1650
Signed-off-by: Dave Airlie <airlied@redhat.com>
1651
Reviewed-by: Eric Anholt <eric@anholt.net>
1652
(cherry picked from commit 79c3925532bc0d098c9a4da6d5117bdada56e0af)
1653
1654
commit 181ea41e71934a0c575322a8be9234f2e64ef8db
1655
Author: Keith Packard <keithp@keithp.com>
1656
Date: Wed Sep 10 19:05:08 2014 -0700
1657
1658
ephyr: Create 3.1 core profile context if possible (v3)
1659
1660
On desktop GL, ask for a 3.1 core profile context if that's available,
1661
otherwise create a generic context.
1662
1663
v2: tell glamor the profile is a core one.
1664
v2.1: add/use GL version defines
1665
v3: let glamor work out core itself
1666
1667
Signed-off-by: Keith Packard <keithp@keithp.com>
1668
Signed-off-by: Dave Airlie <airlied@redhat.com>
1669
Reviewed-by: Eric Anholt <eric@anholt.net>
1670
(cherry picked from commit 98c3504dcfcec227b9c7798a0bd287941cec0691)
1671
1672
commit d7f03d57454de989025de2a2ef644d43eead9ddf
1673
Author: Dave Airlie <airlied@redhat.com>
1674
Date: Mon Jan 11 14:00:35 2016 +1000
1675
1676
glamor: add core profile support. (v2)
1677
1678
Glamor works out from the profile if it is
1679
core.
1680
1681
This flag is used to disable quads for rendering.
1682
1683
v1.1: split long line + make whitespace conform (Michel)
1684
v1.2: add GL 3.1 version defines
1685
v2: move to having glamor work out the profile.
1686
1687
Signed-off-by: Dave Airlie <airlied@redhat.com>
1688
Reviewed-by: Eric Anholt <eric@anholt.net>
1689
(cherry picked from commit 564d9f0f8c17bb3c13aa3ca36da7825454dc5de3)
1690
1691
commit 0cd5b9525a8f661c6b2545c21ce1ba21577c009e
1692
Author: Keith Packard <keithp@keithp.com>
1693
Date: Wed Sep 10 19:02:55 2014 -0700
1694
1695
glamor: Use GL_RED instead of GL_ALPHA if we have texture_swizzle (v3)
1696
1697
GL_RED is supported by core profiles while GL_ALPHA is not; use GL_RED
1698
for one channel objects (depth 1 to 8), and then swizzle them into the
1699
alpha channel when used as a mask.
1700
1701
[airlied: updated to master, add swizzle to composited glyphs and xv paths]
1702
1703
v2: consolidate setting swizzle into the texture creation code, it
1704
should work fine there. Handle swizzle when setting color as well.
1705
v3: Fix drawing to a8 with Render (changes by anholt, reviewed by airlied).
1706
1707
Signed-off-by: Keith Packard <keithp@keithp.com>
1708
Signed-off-by: Dave Airlie <airlied@redhat.com>
1709
Reviewed-by: Eric Anholt <eric@anholt.net>
1710
(cherry picked from commit e6754dcb59ee21abb42421a28f4e467295584f67)
1711
1712
commit 7bd0f79c38cac71d433b1ec7e56a6ff7c2550bcc
1713
Author: Eric Anholt <eric@anholt.net>
1714
Date: Thu Jun 18 11:14:41 2015 -0700
1715
1716
glamor: Delay making pixmaps shareable until we need to.
1717
1718
If a pixmap isn't getting exported as a dmabuf, then we don't need to
1719
make an EGLImage/GBM bo for it. This should reduce normal pixmap
1720
allocation overhead, and also lets the driver choose non-scanout
1721
formats which may be much higher performance.
1722
1723
On Raspberry Pi, where scanout isn't usable as a texture source, this
1724
improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under
1725
xcompmgr -a, because we no longer need to upload our x11perf window to
1726
a tiled temporary in order to render it to the screen.
1727
1728
v2: Just use pixmap->usage_hint instead of a new field. Drop the
1729
changes that started storing gbm_bos in the pixmap priv due to
1730
lifetime issues.
1731
v3: Fix a missing gbm_bo_destroy() on the pixmap-from-fd success path.
1732
1733
[ajax: Restore glamor_egl_create_argb8888_based_texture for ABI reasons.
1734
I'm not aware of any driver using it directly, but.]
1735
1736
Signed-off-by: Eric Anholt <eric@anholt.net>
1737
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
1738
(cherry picked from commit 51984dddfcc7133ed3c1f20d03514aa98c9a7831)
1739
1740
commit ec9b79c8d497522f87697e434f55086f185e65e7
1741
Author: Eric Anholt <eric@anholt.net>
1742
Date: Thu Jun 18 11:26:46 2015 -0700
1743
1744
glamor: Simplify DRI3 pixmap-from-fd, using GBM.
1745
1746
This GBM import path was introduced in 10.2, which we already require.
1747
1748
Signed-off-by: Eric Anholt <eric@anholt.net>
1749
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
1750
(cherry picked from commit 6be33fd044949330e0b2b4185882c9664d2f90b4)
1751
1752
commit fba0d8a3c9deff557f8a9735fc907556e4e861aa
1753
Author: Eric Anholt <eric@anholt.net>
1754
Date: Wed Jan 20 12:33:25 2016 -0800
1755
1756
glamor: Drop duplicated GLAMOR_DEFAULT_PRECISIONs in render accel.
1757
1758
We only need it once at the top of the shader, so just put it
1759
there.
1760
1761
Signed-off-by: Eric Anholt <eric@anholt.net>
1762
Reviewed-by: Dave Airlie <airlied@redhat.com>
1763
(cherry picked from commit 5042b0652b9fe5fed57a233880c3429ba390d86d)
1764
1765
commit 389761e592184d78969469914d1aba5d281824fd
1766
Author: Dave Airlie <airlied@redhat.com>
1767
Date: Tue Jan 12 18:13:46 2016 +1000
1768
1769
glamor: Add support for CA rendering in a single pass.
1770
1771
It's been on the list to add dual source blending support to avoid the
1772
two pass componentAlpha code. Radeon has done this for a while in
1773
EXA, so let's add support to bring glamor up to using it.
1774
1775
This adds dual blend to both render and composite glyphs paths.
1776
1777
Initial results show close to doubling of speed of x11perf -rgb10text.
1778
1779
v2: Fix breakage of all of CA acceleration for systems without
1780
GL_ARB_blend_func_extended. Add CA support for all the ops we
1781
support in non-CA mode when blend_func_extended is present. Clean
1782
up some comments and formatting. (changes by anholt)
1783
1784
Signed-off-by: Dave Airlie <airlied@redhat.com>
1785
Signed-off-by: Eric Anholt <eric@anholt.net>
1786
(cherry picked from commit e7308b6c77561df44c04f81509f8ada678705d94)
1787
1788
commit 2e79da2dce15b25534ea83eb453cb9b762a2e29f
1789
Author: Eric Anholt <eric@anholt.net>
1790
Date: Thu Jan 21 12:01:02 2016 -0800
1791
1792
glamor: Drop the composite_with_copy path entirely.
1793
1794
I originally inherited this from the EXA code, without determining
1795
whether it was really needed. Regular composite should end up doing
1796
the same thing, since it's all just shaders anyway. To the extent
1797
that it doesn't, we should fix composite.
1798
1799
Signed-off-by: Eric Anholt <eric@anholt.net>
1800
Reviewed-by: Dave Airlie <airlied@redhat.com>
1801
(cherry picked from commit cab14a9a08ff06bc4cbef79c7be8f1d07c07ebf9)
1802
1803
commit aad8e4714a2bdeada5c7ae42d2047cf6a4720d19
1804
Author: Keith Packard <keithp@keithp.com>
1805
Date: Wed Sep 10 16:17:52 2014 -0700
1806
1807
glamor: Use vertex array objects
1808
1809
Core contexts require the use of vertex array objects, so switch both glamor
1810
and ephyr/glamor over.
1811
1812
Signed-off-by: Keith Packard <keithp@keithp.com>
1813
Reviewed-by: Eric Anholt <eric@anholt.net>
1814
Signed-off-by: Dave Airlie <airlied@redhat.com>
1815
(cherry picked from commit 49aa5e3ea4eecea0562c05a4e52962985a56e510)
1816
1817
commit 6691f523332a5993d3e90e16d8edff7f3b85c4ae
1818
Author: Dave Airlie <airlied@redhat.com>
1819
Date: Tue Jan 19 10:34:14 2016 +1000
1820
1821
glamor/xv: add vbo support (v2.1)
1822
1823
This converts the Xv code to using VBOs instead of
1824
client ptrs. This is necessary to move towards using
1825
the core profile later.
1826
1827
v2: put all boxes into single vbo, use draw arrays
1828
to offset things. (Eric)
1829
v2.1: brown paper bag with releasing vbo.
1830
1831
Reviewed-by: Eric Anholt <eric@anholt.net>
1832
Signed-off-by: Dave Airlie <airlied@redhat.com>
1833
(cherry picked from commit d99204fb5e09ce7be36485d4226f7ad6d6eb24cc)
1834
1835
commit eabe0e0b3685b5ab38c3597f238e92a3e4598441
1836
Author: Dave Airlie <airlied@redhat.com>
1837
Date: Mon Jan 11 14:00:04 2016 +1000
1838
1839
glamor: use vbos in gradient/picture code.
1840
1841
This converts two client arrays users to using vbos,
1842
this is necessary to move to using core profile later.
1843
1844
Reviewed-by: Eric Anholt <eric@anholt.net>
1845
Signed-off-by: Dave Airlie <airlied@redhat.com>
1846
(cherry picked from commit 5582ad1b9b29934498cf3fef305d3a988130cd52)
1847
1848
commit 23e60f917a5af652cd83b8a3a9951c79838721b3
1849
Author: Adam Jackson <ajax@redhat.com>
1850
Date: Mon Feb 8 18:32:57 2016 -0500
1851
1852
xserver 1.18.1
1853
1854
Signed-off-by: Adam Jackson <ajax@redhat.com>
1855
1856
commit a0d49b1c660f2453d07ce23bf86b0ef717f3d2c8
1857
Author: Timo Aaltonen <tjaalton@ubuntu.com>
1858
Date: Wed Jan 27 14:18:50 2016 +0200
1859
1860
dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
1861
1862
Adds Skylake, Kabylake and Broxton allowing them to use
1863
modesetting + glamor with dri2.
1864
1865
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
1866
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
1867
(cherry picked from commit 50ca286d79f6304b972ea74487308e7794a170fb)
1868
1869
commit bc4b234d6f4b7b211f7a9750a97524e9652d0e6e
1870
Author: Adam Jackson <ajax@redhat.com>
1871
Date: Wed Jan 27 11:50:13 2016 -0500
1872
1873
modesetting: Require sufficiently new libdrm
1874
1875
Bugzilla: https://bugs.freedesktop.org/93883
1876
Signed-off-by: Adam Jackson <ajax@redhat.com>
1877
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
1878
Reviewed-by: Julien Cristau <jcristau@debian.org>
1879
(cherry picked from commit bf23db42a4e5943129501223a47b48884cdeb62f)
1880
1881
commit 0b95625cecc7dc2cb6aff61edbc8366e8ffd516f
1882
Author: Dave Airlie <airlied@redhat.com>
1883
Date: Tue Jan 19 02:01:09 2016 +0000
1884
1885
glamor: don't do copy if we have 0 boxes to copy.
1886
1887
This happens if you run twm + mplayer + xclock and drag
1888
the clock over the mplayer. If we don't catch it, we cause
1889
an illegal draw elements command to be passed to GL.
1890
1891
Signed-off-by: Dave Airlie <airlied@redhat.com>
1892
Reviewed-by: Eric Anholt <eric@anholt.net>
1893
(cherry picked from commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667)
1894
1895
commit 71be56c426bd9b66cbc5ab23923f4564e066cd75
1896
Author: Eric Anholt <eric@anholt.net>
1897
Date: Thu Jan 21 11:30:15 2016 -0800
1898
1899
glamor: Fix copy-like Render operations between 15 and 16 depth.
1900
1901
Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up
1902
failing, unless you're doing a straight copy at the same bpp where the
1903
misinterpretation matches on both sides.
1904
1905
Fixes rendercheck/blend/over and renderhceck/blend/src in piglit.
1906
1907
Please cherry-pick this to active stable branches.
1908
1909
Signed-off-by: Eric Anholt <eric@anholt.net>
1910
Reviewed-by: Dave Airlie <airlied@redhat.com>
1911
(cherry picked from commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7)
1912
1913
commit 6a4f771c5da99d5f723d61e1a780390a5e6b161b
1914
Author: Adam Jackson <ajax@redhat.com>
1915
Date: Wed Jan 20 15:43:10 2016 -0500
1916
1917
glx: Fix GLX_EXT_create_context_es2_profile support
1918
1919
As of v4 of this extension, any GLES version number may be requested (to
1920
enable GLES3 and later). To comply with this, simply remove the API
1921
version checks and leave it to the DRI driver to validate. This happens
1922
to also enable using GLES1 in direct contexts, so if that's the dire
1923
situation you find yourself in, your client driver at least stands a
1924
chance of working.
1925
1926
v4 also specifies that both extension strings should be advertised for
1927
compatibility with clients written against v1 of the extension spec, so
1928
add the es_profile bit to the extension list and enable it whenever we
1929
would enable es2_profile.
1930
1931
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
1932
Signed-off-by: Adam Jackson <ajax@redhat.com>
1933
(cherry picked from commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5)
1934
1935
commit ff562c9f98bbce91b61b06dfc51aa30c14180cdd
1936
Author: Michel Dänzer <michel.daenzer@amd.com>
1937
Date: Fri Jan 15 18:22:21 2016 +0900
1938
1939
present: Handle wraparound when comparing MSC values
1940
1941
When a window moves from one CRTC to another, present_window_to_crtc_msc
1942
updates window_priv->msc_offset according to the delta between the
1943
current MSC values of the old and new CRTC:
1944
1945
window_priv->msc_offset += new_msc - old_msc;
1946
1947
window_priv->msc_offset is initially 0, so if new_msc < old_msc,
1948
window_priv->msc_offset wraps around and becomes a large number. If the
1949
window_msc parameter passed in is small (in particular if it's 0, such as
1950
is the case when the client just wants to know the current window MSC
1951
value), the returned CRTC MSC value may still be a large number. In that
1952
case, the existing MSC comparisons in pixmap_present weren't working as
1953
intended, resulting in scheduling a wait far into the future when the
1954
target MSC had actually already passed. This would result in the client
1955
(e.g. the Chromium browser) hanging when moving its window between CRTCs.
1956
1957
In order to fix this, introduce msc_is_(equal_or_)after helper functions
1958
which take the wraparound into account for comparing two MSC values.
1959
1960
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
1961
Reviewed-by: Keith Packard <keithp@keithp.com>
1962
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
1963
Signed-off-by: Keith Packard <keithp@keithp.com>
1964
(cherry picked from commit 25eca80265654cfbf8768024e027426fedeb0918)
1965
1966
commit 9505783c2270b6da13cc5691b94f48ff72d7b625
1967
Author: Michel Dänzer <michel.daenzer@amd.com>
1968
Date: Tue Jan 12 15:42:47 2016 +0900
1969
1970
glamor: Disable debugging messages other than GL API errors
1971
1972
According to Nicolai Hähnle, the relevant specification says "All
1973
messages are initially enabled unless their assigned severity is
1974
DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
1975
don't want to get. Failing that, we were accidentally logging e.g.
1976
shader stats intended for shader-db.
1977
1978
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
1979
Tested-by: Laurent Carlier <lordheavym@gmail.com>
1980
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
1981
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
1982
Reviewed-by: Eric Anholt <eric@anholt.net>
1983
(cherry picked from commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b)
1984
1985
commit 9e45b28e998a4e0aacd1224b5d4f479ee453fdb9
1986
Author: Dave Airlie <airlied@redhat.com>
1987
Date: Tue Jan 12 14:19:24 2016 +1000
1988
1989
glamor: store old fonts in double width textures.
1990
1991
There is a problem with some fonts that the height necessary
1992
to store the font is greater than the max texture size, which
1993
causes a fallback to occur. We can avoid this by storing two
1994
macro columns side-by-side in the texture and adjusting
1995
the calculations to suit.
1996
1997
This fixes
1998
xfd -fn -*-*-*-*-*-*-*-*-*-*-*-*-*-*
1999
falling back here, when it picks
2000
-arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1
2001
2002
Reviewed-by: Keith Packard <keithp@keithp.com>
2003
Signed-off-by: Dave Airlie <airlied@redhat.com>
2004
(cherry picked from commit 8116fd8a760b5935645def1b2c3b155c05927850)
2005
2006
commit f673c6cffb033286bf4f31fbb64f0863dfbe77f6
2007
Author: Dave Airlie <airlied@redhat.com>
2008
Date: Mon Jan 11 17:02:57 2016 +1000
2009
2010
glamor: fallback if font is too large for FBO size.
2011
2012
running xfontsel on haswell here, with a max texture size
2013
of 8kx8k, one font wants 9711 height. This fallsback to
2014
sw in this case.
2015
2016
A proper solution probably involves using an array texture.
2017
2018
Reviewed-by: Keith Packard <keithp@keithp.com>
2019
Signed-off-by: Dave Airlie <airlied@redhat.com>
2020
(cherry picked from commit 64081d0eacf3e53a029b8e8b63096cc153e98549)
2021
2022
commit f7da9e4cd8237795cea4c0cf82148bdd18ec0f92
2023
Author: Adam Jackson <ajax@redhat.com>
2024
Date: Wed Jan 6 10:03:23 2016 -0500
2025
2026
os: Failure to remove a non-existent log file is not an error
2027
2028
Signed-off-by: Adam Jackson <ajax@redhat.com>
2029
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2030
(cherry picked from commit 6dcb73375e0ce389315d55587623eb84e9d13543)
2031
2032
commit 4dfb05aaae9dc7a45294f60ebd3ad454a4707966
2033
Author: Thomas Klausner <wiz@NetBSD.org>
2034
Date: Wed Nov 11 13:32:05 2015 +0100
2035
2036
Fix build when XSERVER_PLATFORM_BUS is not defined.
2037
2038
Reviewed-by: Adam Jackson <ajax@redhat.com>
2039
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2040
(cherry picked from commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39)
2041
2042
commit 88f2aa2940b6fb9deea0a1b53d05df02912dc17c
2043
Author: Thomas Klausner <wiz@NetBSD.org>
2044
Date: Tue Jan 5 12:51:41 2016 -0500
2045
2046
Fix uninitialized variable warnings reported by clang
2047
2048
v2: Move initializing pos into the first clause of the for statement. We
2049
have to keep this macro equivalent to a plain for statement from the
2050
user's perspective, otherwise callers need to {} things to keep control
2051
flow correct. [ajax]
2052
2053
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2054
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
2055
(cherry picked from commit 63f83d1b7f496d05b409352749cdb6674d71cf80)
2056
2057
commit 320b169c225fa05d83928bad438c4b15481cea1f
2058
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
2059
Date: Fri Jan 1 18:11:14 2016 -0800
2060
2061
Use unique logfile names when starting server with -displayfd
2062
2063
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93212
2064
2065
Previously all X servers started with -displayfd would overwrite
2066
Xorg.0.log - now a temporary name of Xorg.pid-<pid>.log is used
2067
until after -displayfd finds an open display - then it is renamed
2068
to the traditional Xorg.<display>.log name.
2069
2070
Reviewed-by: Adam Jackson <ajax@redhat.com>
2071
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2072
(cherry picked from commit edcb6426f20c3be5dd5f50b76a686754aef2f64e)
2073
2074
commit a32b85bf192bd15e9585e4c13a24407634478b05
2075
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
2076
Date: Fri Jan 1 18:10:08 2016 -0800
2077
2078
modesetting should not reference gbm when it's not defined
2079
2080
Fixes build errors of:
2081
present.c: In function 'ms_do_pageflip':
2082
present.c:410:17: error: 'drmmode_bo' has no member named 'gbm'
2083
new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front);
2084
^
2085
present.c:412:22: error: 'drmmode_bo' has no member named 'gbm'
2086
if (!new_front_bo.gbm) {
2087
^
2088
present.c: In function 'ms_present_check_flip':
2089
present.c:536:36: error: 'drmmode_bo' has no member named 'gbm'
2090
if (drmmode_crtc->rotate_bo.gbm)
2091
^
2092
Introduced by commit 13c7d53d
2093
2094
Reviewed-by: Adam Jackson <ajax@redhat.com>
2095
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2096
(cherry picked from commit fe8562f5316d8c74ca074ad145295c65ddff5fc2)
2097
2098
commit 4457fd45efef85b567d4a0ac085d252ffe49020d
2099
Author: Siim Põder <siim@p6drad-teel.net>
2100
Date: Mon Jun 8 22:14:12 2015 +0000
2101
2102
vfb: add randr support (v2)
2103
2104
The motivation for getting this is chrome remote desktop that runs under
2105
Xvfb and wants to use RANDR to adjust screen size according to the
2106
remote desktop client screen size. Apparently there are other use cases
2107
as well, the bug mentions gnome-settings-daemon testing.
2108
2109
[ajax: massaged commit message]
2110
2111
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=26391
2112
Reviewed-by: Adam Jackson <ajax@redhat.com>
2113
Signed-off-by: Lambros Lambrou <lambroslambrou@google.com>
2114
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2115
Signed-off-by: Michal Srb <msrb@suse.com>
2116
Signed-off-by: Siim Põder <siim@p6drad-teel.net>
2117
(cherry picked from commit 3d68d1f26709ecb5ce22a9baa0d3d8162574ed6a)
2118
2119
commit 5a89a6336d6b70781101e6395c276649956b9d80
2120
Author: Adam Jackson <ajax@redhat.com>
2121
Date: Tue Dec 8 15:56:17 2015 -0500
2122
2123
glxproxy: Silence shadowed-variable warnings
2124
2125
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2126
Signed-off-by: Adam Jackson <ajax@redhat.com>
2127
(cherry picked from commit b5f04a79df8b5aab8b558461261d14721f0b3e41)
2128
2129
commit c10def69e1d92741ab79eee0b26ae80d143c93fb
2130
Author: Adam Jackson <ajax@redhat.com>
2131
Date: Tue Dec 8 15:53:35 2015 -0500
2132
2133
glxproxy: Silence set-but-unused-variable warnings
2134
2135
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2136
Signed-off-by: Adam Jackson <ajax@redhat.com>
2137
(cherry picked from commit 18729a211a5fdd4f733e44eded754a0e6210b687)
2138
2139
commit e36834cee865152dee5fbe1e8d480b7010466f75
2140
Author: Adam Jackson <ajax@redhat.com>
2141
Date: Tue Dec 8 16:04:44 2015 -0500
2142
2143
dmx: Run 'doxygen -u' to upgrade the doxygen config file
2144
2145
Also change the dot font setting back to the default of Helvetica as
2146
doxygen no longer ships FreeSans.
2147
2148
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2149
Signed-off-by: Adam Jackson <ajax@redhat.com>
2150
(cherry picked from commit bc996fa4e3c06f65eafe0a88ef491dbf01f31422)
2151
2152
commit bb9bdb213250dbd28a61f91dba2145d20ef5f569
2153
Author: Adam Jackson <ajax@redhat.com>
2154
Date: Tue Dec 8 16:00:19 2015 -0500
2155
2156
dmx: Silence unused variable warning in dmxcompat
2157
2158
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2159
Signed-off-by: Adam Jackson <ajax@redhat.com>
2160
(cherry picked from commit a55e0bc56fd8f9da8f066dc344af19535dd092ca)
2161
2162
commit 1f5afbba4513c0e0d2d8827f3bbbbc383fd918f0
2163
Author: Adam Jackson <ajax@redhat.com>
2164
Date: Tue Dec 8 15:37:12 2015 -0500
2165
2166
dmx: Silence lex/yacc-related config parser warnings
2167
2168
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2169
Signed-off-by: Adam Jackson <ajax@redhat.com>
2170
(cherry picked from commit 2730ccb803c55af74dbdd1bfd982fc23e643554d)
2171
2172
commit b63a8cc4f24012267b0cb88bc358e68ab3ceb427
2173
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
2174
Date: Thu Dec 3 08:05:59 2015 -0200
2175
2176
systemd-logind.c: don't parse VT settings for non-seat0 X servers
2177
2178
Since non-seat0 X servers no longer touch VTs, I believe these settings
2179
are unnecessary.
2180
2181
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
2182
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2183
(cherry picked from commit 718223d27452862eedcf1bee6278eae6040d45ea)
2184
2185
commit a8b746948db1871c0b28663b99fa839582693087
2186
Author: Bob Ham <bob.ham@collabora.com>
2187
Date: Fri Dec 4 12:30:47 2015 +0000
2188
2189
xserver: Fix configure.ac check for libsystemd/-daemon
2190
2191
The configure script looks for the libsystemd-daemon pkg-config
2192
module. If the configure script finds it, the script will add
2193
libsystemd-daemon to a list of modules which are used to consolidate
2194
CFLAGS and LIBS.
2195
2196
The check for libsystemd-daemon was altered to fallback to libsystemd
2197
if libsystemd-daemon was not found (libsystemd-daemon was brought into
2198
libsystemd). Unfortunately, the configure script still adds
2199
"libsystemd-daemon" to the list of modules to consolidate, instead of
2200
"libsystemd". With this patch, we set a variable depending on which
2201
pkg-config module is found and add that to the module list instead.
2202
2203
Changes since v1:
2204
- Rearranged logic so that we do a versioned check for libsystemd
2205
first, then look for libsystemd-daemon.
2206
- Cleaned up the check a bit, only performing the module checks if we
2207
don't have --with-systemd-daemon=no, in a similar style to
2208
--with-dtrace.
2209
- Changed the variable name to LIBSYSTEMD_DAEMON as per feedback.
2210
2211
Reviewed-by: Adam Jackson <ajax@redhat.com>
2212
Signed-off-by: Bob Ham <bob.ham@collabora.com>
2213
(cherry picked from commit 7c0ba32ddd5f1d5c65279365fa307dec3433caf3)
2214
2215
commit b564cc9121bade2fee22eb14edd360036b7ba0b9
2216
Author: Michel Dänzer <michel.daenzer@amd.com>
2217
Date: Thu Dec 3 17:04:09 2015 +0900
2218
2219
prime: Damage full destination rectangle when we start dirty tracking
2220
2221
This makes sure that the destination pixmap contents will be fully
2222
initialized. Without this, a PRIME output starts out with garbage.
2223
2224
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
2225
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2226
(cherry picked from commit 530d3e5ca0a02039b04ec6a677bbb4e05b78e5f4)
2227
2228
commit 00f65597c80d01e1c0759527ed1c72bc5af46c29
2229
Author: Adam Jackson <ajax@redhat.com>
2230
Date: Mon Dec 7 17:03:02 2015 -0500
2231
2232
x86emu: Squash a warning
2233
2234
Apologies, should have caught this one when applying the previous x86emu
2235
patch.
2236
2237
Signed-off-by: Adam Jackson <ajax@redhat.com>
2238
(cherry picked from commit 2a52c06e235bd79f91851121f53f7c1808fde321)
2239
2240
commit 4415b0cd6f1ddd75f2dc8b2096a89716baa38405
2241
Author: Julian Pidancet <julian.pidancet@gmail.com>
2242
Date: Sun Jul 1 18:49:25 2012 +0100
2243
2244
x86emu: Correctly handle 0x66 prefix for some instructions
2245
2246
(Sorry for double posting)
2247
2248
I repost this patch because I havn't got any replies from maintainers
2249
since I posted the initial patch back in March.
2250
2251
Some instructions are not emulated correctly by x86emu when they
2252
are prefixed by the 0x66 opcode.
2253
I've identified problems in the emulation of these intructions: ret,
2254
enter, leave, iret and some forms of call.
2255
2256
Most of the time, the problem is that these instructions should push or
2257
pop 32-bit values to/from the stack, instead of 16bit, when they are
2258
prefixed by the 0x66 special opcode.
2259
2260
The SeaBIOS project aims to produce a complete legacy BIOS
2261
implementation as well as a VGA option ROM, entirely written in C and
2262
using the GCC compiler.
2263
2264
In 16bit code produced by the GCC compiler, the 0x66 prefix is used
2265
almost everywhere. This patch is necessary to allow the SeaBIOS VGA
2266
option ROM to function with Xorg when using the vesa driver.
2267
2268
SeaBIOS currently use postprocessing on the ROM assembly output to
2269
replace the affected instruction with alternative unaffected instructions.
2270
This is obviously not very elegant, and this fix in x86emu would be
2271
more appropriate.
2272
2273
v2: - Decrement BP instead of EBP in accordance with the Intel Manual
2274
- Assign EIP instead of IP when poping the return address from the
2275
stack in 32-bit operand size mode in ret_far_IMM, ret_far, and iret
2276
- When poping EFLAGS from the stack in iret in 32-bit operand size
2277
mode, apply some mask to preserve Read-only flags.
2278
2279
v3: - Rebase
2280
2281
Reviewed-by: Adam Jackson <ajax@redhat.com>
2282
Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
2283
(cherry picked from commit 59b618227ebd024e57720aaaea17596953f5b80e)
2284
2285
commit cc0cefed4f098ce6e933f2142a4fee93df5f652d
2286
Author: Chris Wilson <chris@chris-wilson.co.uk>
2287
Date: Sun Feb 8 09:47:42 2015 +0000
2288
2289
present: Do not replace Pixmaps on redirected Window on unflip
2290
2291
When unflipping, we may find that our flip window has been redirected.
2292
If we replace the redirected Window with the Screen Pixmap we then have
2293
mutliple fullscreen Windows believing that their own the Screen Pixmap -
2294
multiple fullscreen Windows that are being flipped by Clients, and so
2295
continue to flip causing popping between e.g. the compositor and the
2296
game.
2297
2298
[ajax: Fix up present_execute() hunk to account for changes introduced
2299
in fe07ec19e212a68076560d243a2a935c54589068]
2300
2301
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2302
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2303
(cherry picked from commit 72f0724cdc65dc9abbbf70b9feb6cce7c2b9f8a0)
2304
2305
commit cfeea6382b5aaac0dcf59d88f7735b0703c9929f
2306
Author: Chris Wilson <chris@chris-wilson.co.uk>
2307
Date: Sun Feb 8 09:47:41 2015 +0000
2308
2309
present: When cancelling a pending synchronous flip, requeue it
2310
2311
The vblank event request for a synchronous flip is scheduled for the
2312
vblank before the target flip msc (so that the flip itself appears at
2313
the right frame). If we cancel that flip and so wish to schedule a
2314
copy instead, that copy needs to be postponed by a frame in order for it
2315
be performed at the requested time.
2316
2317
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2318
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2319
(cherry picked from commit 180b09912c0d2c4a43b5a08678bcad4b818924c7)
2320
2321
commit 4d48ceb8a15fcf521e8be3dba2756b69e54f20cc
2322
Author: Chris Wilson <chris@chris-wilson.co.uk>
2323
Date: Sun Feb 8 09:47:40 2015 +0000
2324
2325
present: Requery pending flips with the right sync_flip mode
2326
2327
When verifying whether a pending flip is still valid, we need to pass
2328
down the orignal sync_flip mode (e.g. if the driver only supports sync
2329
flips, verifying a async flip will falsely fail).
2330
2331
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2332
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2333
(cherry picked from commit b2d55338f6b8f43ebcb49994abad123a797248cf)
2334
2335
commit 54c74aa952ac7eecaeeb3f3cba6d2fe8a98cf450
2336
Author: Dave Airlie <airlied@gmail.com>
2337
Date: Mon Nov 16 09:05:27 2015 +1000
2338
2339
modesetting: create entities for pci and old probe. (v2)
2340
2341
This moves the code from the platform case into
2342
a common function, and calls that from the
2343
other two.
2344
2345
v2: Emil convinced me we don't need to lookup pEnt
2346
here, so let's not bother.
2347
2348
Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
2349
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2350
Signed-off-by: Dave Airlie <airlied@redhat.com>
2351
(cherry picked from commit 548a3d5fd69bb059bbaf26ededdc94c212712cd7)
2352
2353
commit d94118fa1b75ea773857b7bbeda96ac181feb994
2354
Author: Dave Airlie <airlied@gmail.com>
2355
Date: Mon Nov 16 09:05:26 2015 +1000
2356
2357
modesetting: drop platform_dev pointer.
2358
2359
This isn't used anywhere, so no point storing it until we need it.
2360
2361
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
2362
Signed-off-by: Dave Airlie <airlied@redhat.com>
2363
(cherry picked from commit 771016f0705909c908917b4ccaeafc950ba93c05)
2364
2365
commit 067c4dd5ce06c2f17d54c3b89e23efbc0822a194
2366
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
2367
Date: Mon Nov 16 11:06:57 2015 +0100
2368
2369
Xorg.wrap: activate libdrm based detection for KMS drivers
2370
2371
Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers.
2372
Unfortunately it is never activated since code missed to include file
2373
which defines WITH_LIBDRM.
2374
2375
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894
2376
Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
2377
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2378
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2379
(cherry picked from commit 19b0249a5e07b9fc008e5d8709d7e489874415de)
2380
2381
commit 8f41c32bb5f3b962d4db105f96d47d8b74f5af79
2382
Author: Olivier Fourdan <ofourdan@redhat.com>
2383
Date: Tue Dec 1 17:16:03 2015 +0100
2384
2385
xwayland: Update screen size on output removal
2386
2387
When unplugging an output, it's still listed in xrandr and the size
2388
of the root window still includes the removed output.
2389
2390
The RR output should be destroyed when its Wayland counterpart is
2391
destroyed and the screen dimensions must be updated in both the done
2392
and the destroy handlers.
2393
2394
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92914
2395
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2396
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
2397
(cherry picked from commit ab9837cc6a11f46b9df780f131b69de3822c3dd9)
2398
2399
commit 2b356cb50139601dcd5393646aad30552fa778a1
2400
Author: Jonas Ådahl <jadahl@gmail.com>
2401
Date: Wed Oct 7 12:01:53 2015 +0800
2402
2403
xwayland: Always update the wl_pointer cursor on pointer focus
2404
2405
In Wayland, a client (in this case XWayland) should set the cursor
2406
surface when it receives pointer focus. Not doing this will leave the
2407
curser at whatever it was previously.
2408
2409
When running on XWayland, the X server will not be the entity that
2410
controls what actual pointer cursor is displayed, and it wont be notified
2411
about the pointer cursor changes done by the Wayland compositor. This
2412
causes X11 clients running via XWayland to end up with incorrect pointer
2413
cursors because the X server believes that, if the cursor was previously
2414
set to the cursor C, if we receive Wayland pointer focus over window W
2415
which also has the pointer cursor C, we do not need to update it. This
2416
will cause us to end up with the wrong cursor if cursor C was not the
2417
same one that was already set by the Wayland compositor.
2418
2419
This patch works around this by, when receiving pointer focus, getting
2420
the private mipointer struct changing the "current sprite" pointer to
2421
an invalid cursor in order to trigger the update path next time a cursor
2422
is displayed by dix.
2423
2424
Reviewed-by: Adam Jackson <ajax@redhat.com>
2425
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
2426
(cherry picked from commit 07941a50a547f2ca094e242588298695f48903ed)
2427
2428
commit 74354c4b0086ea1a952b5591846803719e3e3e91
2429
Author: Olivier Fourdan <ofourdan@redhat.com>
2430
Date: Mon Nov 23 08:51:48 2015 +0100
2431
2432
xwayland: Do not set root clip when rootless
2433
2434
Otherwise the server may try to draw onto the root window when closing
2435
down, but when running rootless the root window has no storage thus
2436
causing a memory corruption.
2437
2438
Thanks to Adam Jackson <ajax@redhat.com> for helping tracking this down!
2439
2440
Reviewed-by: Adam Jackson <ajax@redhat.com>
2441
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93045
2442
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2443
Tested-by: Marek Chalupa <mchqwerty@gmail.com>
2444
(cherry picked from commit 51a4399b94f9adfac5f7718d4cbf73f793dcca56)
2445
2446
commit 0a500c3cc74e39a01be24053e152dd52469dd908
2447
Author: Marek Chalupa <mchqwerty@gmail.com>
2448
Date: Fri Nov 27 14:27:46 2015 +0100
2449
2450
xwayland: check if creating xwl_output succeeded
2451
2452
check return values of RR.*Create calls
2453
2454
v2. do not bail out if we don't have any output
2455
2456
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
2457
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2458
(cherry picked from commit 5b2ca3413203210d112a08a4e20d14382abae437)
2459
2460
commit c2e6eddb1bfc5106596729bc3f0a6a381f5be9f4
2461
Author: Marek Chalupa <mchqwerty@gmail.com>
2462
Date: Fri Nov 27 14:59:27 2015 +0100
2463
2464
xwayland: fix memory leaks on error paths in xwl_realize_window
2465
2466
don't leak memory when realizing window fails
2467
2468
v2. take care of all memory allocation and return values,
2469
not just one leak
2470
2471
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
2472
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2473
(cherry picked from commit 646ebea456b4c5251ae997eab8d9b971f97de836)
2474
2475
commit 68168c764662c0ce4ac8193d293b8befd934f666
2476
Author: Egbert Eich <eich@suse.de>
2477
Date: Tue Nov 24 17:37:36 2015 +0100
2478
2479
kdrive/UnregisterFd: Fix off by one
2480
2481
The number of FDs has been decremented already, therefore the
2482
number contained the index of the top one that is to me moved down.
2483
2484
This problem was introduced by:
2485
commit 1110b71e360195aab040d835b54540ab558638c5
2486
Author: Chris Clayton <chris2553@googlemail.com>
2487
2488
kdrive: fix build error on gcc 4.8 for out-of-bounds array access
2489
2490
The reason for the warning was likely a confused compiler.
2491
Hoping to reduce the confusion by moving the decrement behind the end
2492
if the copy loop.
2493
2494
Signed-off-by: Egbert Eich <eich@suse.de>
2495
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2496
(cherry picked from commit 44d0fd435a4eaf45e252b4f00409152a6d599dfc)
2497
2498
commit 84fbfa8a7d40553c5129a667b532ea3a8b63bfb3
2499
Author: Adam Jackson <ajax@redhat.com>
2500
Date: Thu Nov 19 12:21:08 2015 -0500
2501
2502
xnest: Fix needless build dependency on xcb-util-keysyms
2503
2504
This was added in:
2505
2506
commit 43014795087a0a8774dd9687f5967329b15f06a2
2507
Author: Olivier Fourdan <ofourdan@redhat.com>
2508
Date: Mon Jan 5 16:44:22 2015 +0100
2509
2510
Synchronize capslock in Xnest and Xephyr
2511
2512
Which is fine if you're building both, but if you don't happen to have
2513
xcb-util-keysyms' headers installed Xnest will configure as enabled but
2514
fail to build.
2515
2516
Fortunately <X11/X.h> has a corresponding #define, so use that instead.
2517
2518
Signed-off-by: Adam Jackson <ajax@redhat.com>
2519
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
2520
(cherry picked from commit 4affa75a90d2455c81087b930126ad7adfd019f0)
2521
2522
commit 115913d9ec8f7961e9a5789972aeb33da9cfd1e4
2523
Author: Peter Hutterer <peter.hutterer@who-t.net>
2524
Date: Mon Nov 23 07:59:24 2015 +1000
2525
2526
xfree86: fix minor memory leak
2527
2528
xf86*StrOption returns a strdup
2529
2530
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2531
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
2532
(cherry picked from commit 71ba82690158f46d50a455e69a83ee0d685bb274)
2533
2534
commit c9bd60790c6636a7911ca479e0f9439bc118d74c
2535
Author: Eric Anholt <eric@anholt.net>
2536
Date: Sun Oct 18 19:16:20 2015 -0700
2537
2538
glamor: No need to glFlush before destroying a pixmap.
2539
2540
I assume this was a workaround for an old, broken, closed driver. The
2541
driver doesn't get to throw away rendering just because the rendering
2542
context's shared-across-processes render target is getting freed from
2543
the local address space. If the rendering isn't to a shared render
2544
target, then we *do* want to throw away the rendering to it.
2545
2546
Signed-off-by: Eric Anholt <eric@anholt.net>
2547
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2548
(cherry picked from commit 98a1993536add730b7ec29a9e37f62b1cd70ad31)
2549
2550
commit 9379c6a3f6109fe2cca3bf2dc45dc92fcf1e302f
2551
Author: Eric Anholt <eric@anholt.net>
2552
Date: Thu Nov 5 16:35:56 2015 -0800
2553
2554
glamor: Fix segfault in fallback picture uploading.
2555
2556
If the source/mask pixmap is a pixmap that doesn't have an FBO
2557
attached, and it doesn't match the Render operation's size, then we'll
2558
composite it to a CPU temporary (not sure why). We would take the
2559
PictFormatShort from the source Picture, make a pixmap of that depth,
2560
and try to look up the PictFormat description from the depth and the
2561
PictFormatShort. However, the screen's PictFormats are only attached
2562
to the screen's visuals' depths. So, with an x2r10g10b10 short format
2563
(depth 30), we wouldn't find the screen's PictFormat for it
2564
(associated with depth 32).
2565
2566
Instead of trying to look up from the screen, just use the pFormat
2567
that came from our source picture. The only time we need to look up a
2568
PictFormat when we're doing non-shader gradients, which we put in
2569
a8r8g8b8.
2570
2571
Signed-off-by: Eric Anholt <eric@anholt.net>
2572
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2573
(cherry picked from commit 9a5972801f7789833062e5711e77483b643eef92)
2574
2575
commit 6bb58ea2a9c1931f4e04075f19ed22bb50b1d709
2576
Author: Eric Anholt <eric@anholt.net>
2577
Date: Thu Nov 5 16:03:14 2015 -0800
2578
2579
glamor: Fix assert failures when fallback picture upload alloc fails.
2580
2581
If the glTexImage (or glTexSubImage) out-of-memories, error out
2582
cleanly so that we can fall back to software.
2583
2584
Signed-off-by: Eric Anholt <eric@anholt.net>
2585
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2586
(cherry picked from commit e7aa4d3c7420d45cca2b7e1e69e22cebc64d5b74)
2587
2588
commit ade2ed4f8bb66127ad46df22b12d201dad318c3d
2589
Author: Eric Anholt <eric@anholt.net>
2590
Date: Thu Nov 5 15:13:55 2015 -0800
2591
2592
glamor: Fix rendering when core font texture allocation fails.
2593
2594
Signed-off-by: Eric Anholt <eric@anholt.net>
2595
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2596
(cherry picked from commit ff8ef975df9cd99ec6f0b8b8047445091bf35ef0)
2597
2598
commit 90fe7266ab67aa3e45a0a68c71987c70c0496504
2599
Author: Eric Anholt <eric@anholt.net>
2600
Date: Thu Nov 5 15:05:11 2015 -0800
2601
2602
glamor: Fix crashes when the glyph atlas allocation fails.
2603
2604
We already have a fallback path, so we just need to jump to it when we
2605
hit the failure.
2606
2607
Signed-off-by: Eric Anholt <eric@anholt.net>
2608
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2609
(cherry picked from commit a6b05d10da2fe476f46e6dc4ad8a603964735905)
2610
2611
commit 701b4347aca1a9b81492b05cf3ae35fe0499325c
2612
Author: Eric Anholt <eric@anholt.net>
2613
Date: Thu Nov 5 14:47:42 2015 -0800
2614
2615
glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.
2616
2617
The spec allows general undefined behavior when GL_OOM is thrown. But
2618
if the driver happens to throw the error at this point, it probably
2619
means the pixmap was just too big, so we should delete that texture
2620
and have this pixmap fall back to software.
2621
2622
Signed-off-by: Eric Anholt <eric@anholt.net>
2623
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
2624
(cherry picked from commit de959ec939b262cb1cb4c0b6146826e3092843f9)
2625
2626
commit 73799de77f551c22308af1e7ef0b2f83ae49b0e0
2627
Author: Eric Anholt <eric@anholt.net>
2628
Date: Mon Nov 9 15:47:05 2015 -0800
2629
2630
glamor: Avoid GL errors from mapping with size == 0.
2631
2632
GL 4.5 / GLES 3.0 require throwing GL errors at map time, and Mesa
2633
before that might throw errors accidentally if a malloc(0) call was
2634
made to return the mapping.
2635
2636
Signed-off-by: Eric Anholt <eric@anholt.net>
2637
Reviewed-by: Rob Clark <robdclark@gmail.com>
2638
(cherry picked from commit 74be466d40080545117628c376cb59b696db33bc)
2639
2640
commit 7727e433459675f80cb38857a6c82ebb29393072
2641
Author: Michael Stapelberg <stapelberg@google.com>
2642
Date: Tue Nov 3 03:51:48 2015 -0800
2643
2644
Also dump passive grabs on XF86LogGrabInfo
2645
2646
Signed-off-by: Michael Stapelberg <stapelberg@google.com>
2647
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2648
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2649
(cherry picked from commit a6cddb8c04ddc3c48aae3f3611ad9f336fecb09d)
2650
2651
1
commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
2652
2
Author: Adam Jackson <ajax@redhat.com>
2653
3
Date: Mon Nov 9 16:00:26 2015 -0500
Loggerhead is a web-based interface for Breezy
Version: 2.0.1