0232269a2d
Fix style
2018-02-09 19:35:44 +01:00
b2f6941617
Free gamma when property blob creation fails
2018-02-09 18:54:56 +01:00
2df97ed16a
Set needs_swap on output when gamma changes
2018-02-09 17:29:14 +01:00
f5e5d1983b
Do not allow gamma control without a crtc
2018-02-09 17:29:14 +01:00
ab011406ad
Add atomic gamma lut size fetching
...
Legacy gamma lut size now uses the new legacy_crtc member of
wlr_drm_crtc. This was Previously doen using old_crtc in
wlr_drm_connector, but since this refers to the crtc that was connected to
the ouput, this could give the wrong result.
2018-02-09 17:29:14 +01:00
cc1229e75e
Add atomic gamma setting
2018-02-09 17:29:04 +01:00
cdd55b5d19
Merge remote-tracking branch 'upstream/master' into output-damage
2018-02-09 14:50:26 +01:00
08fda567d2
prevents reuse of outdated wlr_output state
...
On the drm output the wlr_drm_connector structs are reused.
This struct contains the wlr_output struct, which is reused as well.
The old code kept modes/edid and output state persistent over hotplug.
This nulls the relevant strings, reads newer edid data and removes old
modes on unplug.
2018-02-06 22:45:37 +01:00
3d3ea32137
Merge remote-tracking branch 'upstream/master' into output-damage
2018-02-03 00:15:44 +01:00
bb39277e97
backend/drm: update output enabled property on modeset
2018-02-02 22:28:08 +01:00
bb4aeb3b2f
backend/drm: support updating cursor when session is paused
2018-02-02 21:01:59 +01:00
babdd6ccf7
backend: fix use-after-free when destroying backends
...
The backend destroy signal is emitted before the output_remove
signal is. When the destroy signal is emitted listeners remove
their output_remove listener, so the output_remove signal is never
received and listeners have an invalid output pointer.
The correct way to solve this would be to remove the output_remove
signal completely and use the wlr_output.events.destroy signal
instead. This isn't yet possible because wl_signal_emit is unsafe
and listeners cannot be removed in listeners.
2018-01-30 19:45:57 +01:00
c5aac77692
Fix some typos
...
Prefer initialize over initialise since used more often in the sources.
2018-01-30 16:10:07 +01:00
f152fdb4c5
Merge pull request #594 from Ongy/drm-surface-buffers
...
relases gbm buffers on init
2018-01-30 11:04:01 +01:00
d498855b9d
backend/drm: fix hw cursor position on rotated and scaled outputs
...
output: add wlr_output_transformed_resolution
2018-01-30 10:23:35 +01:00
51c22d39a4
Merge remote-tracking branch 'upstream/master' into output-damage
2018-01-29 23:24:09 +01:00
ed5b1fdedd
Merge pull request #580 from emersion/screenshooter-renderer-backport
...
Backport screenshooter fixes from the renderer redesign v1
2018-01-29 17:13:23 -05:00
cde0f454b3
Clean up the gbm/egl as well
2018-01-29 11:49:31 +01:00
2cdb646531
relases gbm buffers on init
...
The wlr_drm_surface_init function is called (upon others) when the drm
mode is changed.
When the surface was used previously this replaced the gbm_surface, but
did not replace the gbm buffers (front/back).
With this, wlr_drm_surface_get_from never set up the new buffers with
the new glViewport because surf->front existed.
This frees the buffers to get new buffers on the new surface with the
new viewport.
2018-01-29 11:29:54 +01:00
b47e8c4a1d
backend/drm: do not retry pageflip when swapping buffers
2018-01-28 23:33:38 +01:00
20e6861021
Do not flush damage if swapping buffers failed
...
This should solve issues with multiple outputs on DRM backend.
2018-01-28 22:39:24 +01:00
1ee61dbd0f
Merge remote-tracking branch 'upstream/master' into output-damage
2018-01-28 21:22:50 +01:00
d7dfbd23fa
drm: Use ptrdiff_t instead of intmax_t in format string
...
since we're looking at pointer differences.
Otherwise the build fails on arm like
In file included from ../backend/drm/drm.c:19:0:
../include/wlr/util/log.h:34:17: error: format '%jd' expects argument of type 'intmax_t', but argument 7 has type 'int' [-Werror=format=]
_wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
^
../backend/drm/drm.c:462:2: note: in expansion of macro 'wlr_log'
wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name,
^~~~~~~
../backend/drm/drm.c:462:39: note: format string is defined here
wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name,
~~^
%d
2018-01-27 12:29:56 +01:00
7adf13e284
Fix flickering when switching VT
2018-01-27 11:16:42 +01:00
8d58ed502b
output: add wlr_output_schedule_frame
2018-01-26 22:39:23 +01:00
ece2c1e4e2
Damage tracking for transformed outputs
2018-01-26 22:11:09 +01:00
72507f9820
Clean up session signal handler on drm init fail
2018-01-24 18:27:53 +01:00
4fa90b0511
Backport screenshooter fixes from the renderer redesign v1
...
This backports some changes to #319 to fix the screenshooter data
format. This also adds wlr_backend_get_renderer which will be
useful to support multiple renderers.
2018-01-23 22:06:54 +01:00
59c53e8333
Merge remote-tracking branch 'upstream/master' into output-damage
2018-01-21 22:18:06 +01:00
f8b9f44ff5
Add con/crtc null check to move_cursor in drm
2018-01-21 15:47:02 -05:00
9d4ea146b6
Added crtc null check for other drm funcs
2018-01-21 15:37:23 -05:00
4478cf1ddc
Fixes #575
2018-01-21 14:57:24 -05:00
0365b587f0
output: add damage tracking via buffer age
2018-01-21 00:06:35 +01:00
4ca38b84ed
backend/drm: fix hardware cursors not moving
...
This adds back `wlr_output::needs_swap`. This allows a backend to
request buffer swaps even if the output isn't damaged. This is
needed by the DRM backend to trigger pageflips when the cursor
moves.
2018-01-20 16:43:14 +01:00
584f06ad2f
backend/drm: do not try a pageflip is another one is in pending
2018-01-19 23:46:40 +01:00
f0f97280a0
backend/drm: fix retry pageflip
2018-01-19 23:35:23 +01:00
b331c5c2c5
Merge pull request #549 from emersion/output-enabled
...
Add wlr_output::enabled
2018-01-15 20:53:13 -05:00
0eebaf98d0
drm: do not pageflip when enabling output
2018-01-15 21:49:37 +01:00
3101c300b1
Don't crash if crtc->cursor is NULL
...
Same as what atomic_crtc_set_cursor does
Core was generated by `_build/rootston/rootston'.
Program terminated with signal SIGSEGV, Segmentation fault.
0 0xb6f28a1c in atomic_crtc_move_cursor (drm=0x1ebc8e8, crtc=0x1ead498, x=0, y=0) at ../backend/drm/atomic.c:170
170 if (!crtc || !crtc->cursor) {
(gdb) bt
0 0xb6f28a1c in atomic_crtc_move_cursor (drm=0x1ebc8e8, crtc=0x1ead498, x=0, y=0) at ../backend/drm/atomic.c:170
1 0xb6f2a856 in wlr_drm_connector_move_cursor (output=0x2242b28, x=0, y=0) at ../backend/drm/drm.c:634
2 0xb6f3cea0 in wlr_output_cursor_set_image (cursor=0x21a0338, pixels=0x22e1290 "", stride=24, width=24, height=24, hotspot_x=4, hotspot_y=4) at ../types/wlr_output.c:516
3 0xb6f39da2 in wlr_cursor_set_image (cur=0x22cfc90, pixels=0x22e1290 "", stride=24, width=24, height=24, hotspot_x=4, hotspot_y=4, scale=1) at ../types/wlr_cursor.c:310
4 0xb6f44d2a in wlr_xcursor_manager_set_cursor_image (manager=0x22cfd10, name=0x434420 "left_ptr", cursor=0x22cfc90) at ../types/wlr_xcursor_manager.c:80
5 0x00431c0a in roots_seat_configure_xcursor (seat=0x22cef08) at ../rootston/seat.c:515
6 0x0043137c in roots_seat_init_cursor (seat=0x22cef08) at ../rootston/seat.c:210
7 0x004315ec in roots_seat_create (input=0x218d220, name=0x434594 "seat0") at ../rootston/seat.c:289
8 0x0042ecba in input_get_seat (input=0x218d220, name=0x434594 "seat0") at ../rootston/input.c:39
9 0x0042ed04 in input_add_notify (listener=0x218d228, data=0x218d3b0) at ../rootston/input.c:54
10 0xb6f2f2e6 in wl_signal_emit (signal=0x1ea548c, data=0x218d3b0) at /usr/include/wayland-server-core.h:387
11 0xb6f2f572 in input_add_reemit (listener=0x1ea9990, data=0x218d3b0) at ../backend/multi/backend.c:101
12 0xb6f2db7e in wl_signal_emit (signal=0x1ea992c, data=0x218d3b0) at /usr/include/wayland-server-core.h:387
13 0xb6f2ddaa in handle_device_added (backend=0x1ea9920, libinput_dev=0x2292598) at ../backend/libinput/events.c:87
14 0xb6f2e164 in wlr_libinput_event (backend=0x1ea9920, event=0x2292b78) at ../backend/libinput/events.c:198
15 0xb6f2d678 in wlr_libinput_readable (fd=23, mask=1, _backend=0x1ea9920) at ../backend/libinput/backend.c:28
16 0xb6f2d7c0 in wlr_libinput_backend_start (_backend=0x1ea9920) at ../backend/libinput/backend.c:74
17 0xb6f27170 in wlr_backend_start (backend=0x1ea9920) at ../backend/backend.c:30
18 0xb6f2f320 in multi_backend_start (wlr_backend=0x1ea5480) at ../backend/multi/backend.c:22
19 0xb6f27170 in wlr_backend_start (backend=0x1ea5480) at ../backend/backend.c:30
20 0x0042fbc6 in main (argc=1, argv=0xbe89dd04) at ../rootston/main.c:60
2018-01-15 13:37:53 +01:00
53ba9b4eec
Fix output enable in DRM backend
2018-01-07 00:28:21 +01:00
771263380c
Add wlr_output::enabled
2018-01-04 12:46:15 +01:00
8e24aaa3c6
style: fix sizeof() calls without parentheses
2017-12-28 16:28:19 +01:00
e737f65e38
Fix cursor on transformed output with DRM backend
2017-12-26 18:16:37 +01:00
a937016e38
remove session from multibackend
2017-12-19 18:25:46 -05:00
be95147385
drm backend: add wlr_output_is_drm
2017-12-19 20:13:49 +01:00
b99d1f4fcc
Refactor wlr_egl_init to accept config_attribs
2017-12-17 23:51:04 +01:00
0256de0002
Add full refresh rate support to custom modes
2017-12-17 18:02:55 +01:00
23fb663ea4
Merge pull request #453 from emersion/surface-transform
...
Add surface transforms support
2017-12-14 14:43:04 -05:00
466e86b7b2
Merge branch 'master' into surface-transform
2017-12-14 20:31:18 +01:00
75ef7860bb
Merge branch 'master' into display-destroy
2017-12-14 20:29:30 +01:00
3b4b8953d9
Update output layout when scale or transform changes
2017-12-12 21:58:00 +01:00
c67a5824b8
Merge branch 'master' into display-destroy
2017-12-11 16:14:03 +01:00
18eb1eee3f
Listen to display destroy in xwayland, rename wlr_egl_free
2017-12-08 00:59:37 +01:00
9d43adaafa
Listen to display destroy in backends
2017-12-07 23:44:59 +01:00
91d72040e5
Configure outputs with make, model, serial in rootston
...
Added fallbacks in DRM backend in case EDID extension data for model and serial is missing.
Updates #403
2017-12-07 13:59:19 +01:00
8af779fae6
Fix segfault when moving hardware cursor
2017-12-05 22:23:01 +01:00
6a69b4419f
Make wlr_output_transform_* functions public, refactoring
2017-12-01 09:15:33 +01:00
bc113c16aa
Use correct include path for glapi.h
2017-11-30 10:32:55 +13:00
09279b90a6
Add wlr_output.serial
2017-11-11 19:09:34 +01:00
f451ea3639
rootston exit: fix drm destroy
...
wlr_drm_connector were being freed without removing them
from the drm->outputs list, segfaulting on destroy
2017-11-01 19:37:35 +01:00
a15b35aa10
Remove mysterious hotspot switch in DRM backend
2017-11-01 14:36:58 +01:00
60c018c017
Fix hidden software cursors, fix cursor transformations on DRM backend
2017-11-01 14:25:41 +01:00
0beae99188
Apply output transformation to pointer events in Wayland backend
2017-11-01 11:00:27 +01:00
c3b09f73da
Fix cursor hotspot with rotated outputs on DRM backend
2017-10-31 12:30:57 +01:00
6656e25fd4
Transform cursor hotspot
2017-10-31 12:30:56 +01:00
1b6c729360
Add wlr_output_cursor
2017-10-31 12:30:03 +01:00
fa9c6ecc53
Fix segfault in DRM cursor
2017-10-28 15:09:38 -04:00
9d587d759f
Do not set hw cursor if disabled when switching VT
2017-10-26 18:58:44 +02:00
75f0a6c998
Merge pull request #286 from versusvoid/update-connector-crtc-bindings
...
Update Connector-CRTC bindings after resume in DRM backend
2017-10-23 20:25:40 +13:00
3ed3271b98
Rescan connectors on DRM resume
2017-10-22 21:44:24 +00:00
549777ca19
Set crtc field when scanning for DRM connectors
...
and always use it when matching CRTCs with connectors.
Fix deactivated monitors check.
2017-10-22 21:38:30 +00:00
3c31209a97
Reinitialize only changed DRM outputs after setting mode on one
2017-10-22 21:34:56 +00:00
ecb2a2b0d3
Emit output resolution event only when resolution changes
2017-10-22 21:34:56 +00:00
1cc8f21d8e
Cleanup wlr_gamma_control
2017-10-22 23:11:26 +02:00
e1d213fccd
Create globals only for enabled outputs in DRM backend
2017-10-22 22:21:23 +02:00
2ab080e79a
Fix index computation in DRM output scan and CRTC match
2017-10-22 10:54:09 +00:00
16f35ecbea
Merge branch 'master' into heghe/wl_list
2017-10-21 22:03:48 -04:00
169b68b17c
Rename remaining refs to wlr_list
2017-10-21 22:02:36 -04:00
bdeffad7e5
Remove drm field from wlr_drm_connector
2017-10-22 10:36:07 +13:00
822a9f65a4
Add pointer to backend inside wlr_output
2017-10-22 10:36:07 +13:00
4ea84c5765
Remove unnecesary wlr_renderers
2017-10-22 10:36:07 +13:00
9b984253e2
Move egl.h to render/egl.h
2017-10-22 10:36:07 +13:00
e1f196a3e9
Replace list_t with wl_list for wlr_input_device
...
Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
2017-10-20 11:50:43 +03:00
1d716241af
Replace list_t with wl_list in wlr_output
...
Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
2017-10-20 11:46:09 +03:00
c03e774636
Replace list_t with wl_list in wlr_drm_backend
...
Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
2017-10-20 11:46:03 +03:00
92daa790bb
Allow to update the cursor hotspot without its pixels
2017-10-12 09:40:51 +02:00
c0e5feea37
Add GL/EGL extension loader generator
2017-10-08 13:23:41 +13:00
641d08ce7e
Transform hotspot with cursor
...
Fix #188
2017-10-06 09:07:08 +03:00
c5df6ca900
Fix memory leaks
2017-10-05 20:01:56 +00:00
f193623ca1
Change iface prefix to suffix
2017-10-02 21:44:33 +13:00
f6f9c40965
Minor fixes
2017-10-01 22:44:24 +13:00
009c3747a8
Multi-GPU DRM
2017-10-01 22:29:25 +13:00
fa3d0ed929
Change wlr_session to open every GPU
2017-10-01 16:47:05 +13:00
eaef028976
Add renderer pointer inside drm_surface
2017-10-01 15:55:25 +13:00
4101b89700
Rename wlr_drm_output to wlr_drm_connector
2017-09-30 23:31:08 +13:00
22e77d9195
Rename backend to drm
2017-09-30 22:22:26 +13:00
ec5b95e08f
Add pointer to backend from DRM outputs
2017-09-30 22:01:59 +13:00
096249a2a1
Split DRM rendering to its own file
2017-09-30 20:52:58 +13:00
d0708b1a3a
Split DRM internal interface to its own header
2017-09-30 19:11:41 +13:00
610b0493ac
Rename files to remove pointless drm prefix
2017-09-30 19:03:34 +13:00
c8a8ff66f2
Removed unused fields
2017-09-30 18:53:05 +13:00
517ba0bc16
Change egl_get_config to always use visual id
2017-09-29 16:15:09 +13:00
c8c5aedaa2
Add error checking to DRM legacy
2017-09-24 12:19:49 +13:00
419400ae00
Send failure code on partial atomic commit
2017-09-24 12:09:17 +13:00
a466c86fba
Set state properly
2017-09-24 12:06:00 +13:00
db5e9385d4
Simplify retry_pageflip
2017-09-23 18:44:39 +12:00
025b3ee515
Add error recovery for failed page flips
2017-09-23 18:27:14 +12:00
459d138fa2
Add timeout to DRM cleanup
...
This prevents a potential infinite loop preventing us from closing
properly.
2017-09-23 16:32:25 +12:00
8cbade355f
Print connector name on atomic commit failure
2017-09-23 13:38:43 +12:00
4a53aab466
Allow forcing legacy DRM interface
2017-09-23 13:20:17 +12:00
1682c0d983
Remove non-blocking flag on modesetting commits
...
This seems to make hotplugging DisplayPort MST connectors more reliable.
2017-09-10 00:13:39 +12:00
6717b78bd6
Retry atomic commit on failure
...
So we don't lose any previously "good" properties that were set.
2017-09-09 23:10:18 +12:00
0aa00da1f3
Check for disappearing DRM connectors
...
DisplayPort MST connectors will disappear when they're disconnected, so
we need to check for that.
2017-09-09 23:09:51 +12:00
6f98b5a337
Add set_gamma and get_gamma_size to wlr_output_impl
2017-09-06 18:53:08 +02:00
6daf9e9ab2
Merge pull request #120 from acrisci/feature/wlr-cursor
...
wlr_cursor
2017-08-29 12:12:18 -05:00
e3d47376dc
add wlr_cursor basic implementation
2017-08-26 08:32:11 -04:00
fb93628bda
Merge wlr_udev into wlr_session
2017-08-26 14:02:04 +12:00
f24b3df980
wlr renderer/texture: rename init to create when it does alloc
2017-08-19 08:33:31 +02:00
0252c8e072
drm realloc_crtcs: check we found an output
...
This follows-up on #105 that just initialized to 0.
Instead, make sure we actually found an output that matches
2017-08-18 18:27:59 +02:00
784cf65635
fix uninitialized warning
...
`index` might be uninitialized. Warning can be produced with gcc and `-01` flag.
2017-08-18 12:08:28 -04:00
e7fa4f12e1
Fix DRM problem introduced in 901c14c
2017-08-16 17:36:57 -04:00
901c14c409
Prevent alloc errors from crashing in `list_t`
...
This commit changes the `list_t` api so that alloc errors can be
detected and worked around. Also fixes errors not found in 5cc7342
2017-08-16 09:23:21 +02:00
c8c6619146
Refactor out wlr_output_mode_state
2017-08-14 08:03:51 -04:00
de66bdb867
Add backend detection functions
...
Resolves #80
2017-08-13 23:08:33 +02:00
41e735242d
Remove wlr_output_state, update backends
2017-08-13 11:38:03 -04:00
4386816889
wlr_backend_init -> wlr_backend_start
...
Also renames create to init. We'll use create for anything that
allocates and init for anything that takes a pointer and initializes it.
2017-08-13 10:19:57 -04:00
234b2104e4
Refactor wlr_backend_state out of DRM backend
2017-08-12 19:52:22 -04:00
de86965174
Use libinput_event_destroy/xkb_*_unref
...
Also sneak in a missing drmModeFreePlaneResources
2017-08-12 00:11:18 +02:00
0354aaeff2
Complete a few destroy functions
...
This adds missing free calls for:
- drm outputs
- libinput backend in general
- final udev free
- output mode state
2017-08-11 19:17:03 +02:00
6569c2b626
Merge pull request #53 from nyorain/drm_buffer
...
Implement drm (egl) buffer attaching
2017-08-10 22:20:21 -04:00
c24351681f
Refactor EGL handling
2017-08-10 22:15:37 -04:00
fe2fbd0fad
Fix possible use of CRTC after monitor is unplugged
2017-08-11 11:12:41 +12:00
67369173aa
Implement drm (egl) buffer attaching
2017-08-10 10:59:58 +02:00
a77fac0760
Added null check on crtc
2017-08-10 01:43:42 +12:00
af67966d92
Atomic modesetting
2017-08-09 08:07:00 -04:00
e167f41fde
Rename wlr_surface -> wlr_texture; attach -> upload
2017-08-08 18:25:16 +02:00
d09ca20a4d
Use gbm_bo_map for cursor
2017-08-07 21:07:42 +12:00
dbe66d1963
Style changes
2017-08-07 10:15:05 +12:00
5f7042a1f2
Moved headers
2017-08-06 21:49:04 +12:00
d307c2f2c2
Renamed some variables to be less generic
2017-08-06 21:42:36 +12:00
1db97a9af9
Updated DRM cursor rendering
2017-08-06 21:38:40 +12:00
aedfa27d3a
Clean up resources when plane is reassigned
2017-08-06 15:54:38 +12:00
2f8b5c4448
More cleanups
2017-08-06 15:53:41 +12:00
dd7a349295
Various cleanups
2017-08-06 15:51:49 +12:00
d1ca1ec16e
Split off some functions into drm-util
2017-08-06 15:51:49 +12:00
c46605d605
Use plane for rendering
2017-08-06 15:50:23 +12:00
e16c5504cd
Add planes.
2017-08-06 15:49:05 +12:00
67b51f0922
Upgraded CRTC and Encoder matching
2017-08-06 15:49:05 +12:00
31867a1b2e
Various changes/cleanups
2017-08-06 15:49:05 +12:00
7b772e1a4b
DRM resource initalisation
2017-08-06 15:49:02 +12:00
Vincent Vanlaer
emersion
Markus Ongyerth
Guido Günther
Tony Crisci
Timidger
Drew DeVault
Dominique Martinet
Scott Anderson
Versus Void
Heghedus Razvan
Calvin Lee
nyorain