Commit graph

118 commits

Author SHA1 Message Date
Kristian Høgsberg
cb3eaae9ad compositor: Change notify_* function to take a weston_seat
Fewer indirections and derefs, and it's also more appropriate for a
backend calling into weston core to pass a weston_seat.
2012-08-10 13:00:52 -04:00
Kristian Høgsberg
16333ab0ab compositor: Remove compositor->seat
Get rid of this quick-and-dirty assumption.
2012-08-10 10:08:21 -04:00
Kristian Høgsberg
99fd1015d0 compositor: Drop output->flags
All outputs are EGLSurface based so we can drop this detail now.
2012-08-10 09:58:02 -04:00
Kristian Høgsberg
8a01580f17 compositor-drm: Fix bad rebase
I failed to compile test my rebase of Robs compositor-drm fixes.
2012-08-09 17:19:23 -04:00
Rob Clark
ab5b1e3149 compositor-drm: don't keep trying if hw doesn't support cursors
Not all hw supports hw cursors.  Similar to the case with sprites, if
the driver does not support it, don't keep trying and spamming the log
with error messages.

Signed-off-by: Rob Clark <rob@ti.com>
2012-08-09 17:11:03 -04:00
Rob Clark
4339add9e9 compositor-drm: don't attempt sprite for out of bounds dimensions
The drmModeAddFB2() call will fail anyways, and cause us to unnecessarily
set sprites_are_broken.

Signed-off-by: Rob Clark <rob@ti.com>
2012-08-09 17:08:40 -04:00
Rob Clark
702ffaea3e compositor-drm: skip overlay for shm buffers
They can't be imported by gbm, so no point in trying, and segfaulting
in gbm when we try to import (because it tries to deref the buffer as
a wl_drm_buffer).

Signed-off-by: Rob Clark <rob@ti.com>
2012-08-09 17:05:20 -04:00
Ander Conselvan de Oliveira
42c46466ab compositor-drm: Return the newly added mode in drm_output_add_mode()
Most of the times the caller will look at the output's mode list to get
the new mode, so just return that instead.
2012-08-09 14:40:12 -04:00
Ander Conselvan de Oliveira
dc79e6d289 compositor-drm: Check for OUTPUT_CONFIG_OFF instead of using strcmp()
A call to strcmp() is already made in output_section_done() and
output->config is set appropriately if mode is "off". There is
no need to duplicate that in create_output_for_connector().
2012-08-09 14:39:13 -04:00
Rob Clark
5ca1a47e23 compositor-drm: handle vblanks on secondary crtc
Signed-off-by: Rob Clark <rob@ti.com>
2012-08-09 12:47:06 -04:00
Pekka Paalanen
3eb4761317 evdev: rename evdev_input_device to evdev_device
As said by krh: "Maybe we should also just call it an evdev_device
instead, shorter [and] not really ambiguous."

[krh: if my typo filled irc is going in a commit message, I'm at least going
to insert the missing words.]

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-09 10:29:18 -04:00
Pekka Paalanen
b9d38f4552 evdev: do not pass a list to evdev_led_update()
evdev_led_update() does not really need the whole list of device at
once, it can be called one device at a time.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-09 10:28:35 -04:00
Pekka Paalanen
ae29da2eb8 compositor-drm: fix weston_log format errors
compositor-drm.c: In function 'drm_output_set_cursor':
compositor-drm.c:754:4: warning: too few arguments for format
compositor-drm.c:759:4: warning: too few arguments for format

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-09 10:27:34 -04:00
Kristian Høgsberg
79af73e313 compositor-drm: Disable planes when zoomed or capturing
When the entire output is transformed or we're capturing the output
for screenshot or video, disable all output specific overlays
(drm planes, hw cursors etc) and move all surfaces into the primary
plane.
2012-08-03 16:33:42 -04:00
Pekka Paalanen
d858351a61 compositor-drm, evdev: don't crash on missing keyboard
Weston's notify_keyboard_focus_*() assume that a keyboard is present, if
they are called. With evdev, there might not always be a keyboard.

Also clean up the variable definition in evdev_notify_keyborad_focus().
I read that function through many times and finally had to grep where
does 'all_keys' come from.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-03 13:32:20 -04:00
Pekka Paalanen
81a13a3757 compositor-drm: log enter/leave VT
All input devices are re-added during enter VT, so these messages in the
log will clarify what happened with input.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-03 13:32:10 -04:00
Pekka Paalanen
42b3f6ae64 compositor-drm: log input device hot-unplugs
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-03 13:32:06 -04:00
Pekka Paalanen
d2e69c2c6f compositor-drm: fix leak in evdev_udev_handler()
If the sysname of the udev device did not start with "event", the
function returned without unreferencing udev_device.

The function is refactored to have a common exit path that unrefs
udev_device. The return value semantics are not changed.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-03 13:32:03 -04:00
Pekka Paalanen
3315697739 evdev: move udev code into compositor-drm.c
Move all udev-related and now drm backend specific code into
compositor-drm.c.

This makes evdev.c free of udev and launcher-util, and allows it to be
used on Android.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-08-03 13:31:30 -04:00
Kristian Høgsberg
5626d34d63 compositor-drm: Split cursor handling into prepare and set
Like how we handle overlays, we split drm_output_set_cursor() into
drm_output_prepare_cursor_surface() that will assign the hw cursor to
a suitable surface and drm_output_set_cursor() that will do the actual
work of updating cursor contents and moving it.  This is more in line
with how we handle everything else, and lets us update cursor contents
based on changes to the cursor plane damage.

This works when the cursor content changes but also accumulates
damage when the cursor changes output.  In that case we move the
cursor surface to the cursor plane in the new output and
weston_surface_move_to_plane() will generate the damage that triggers
download of sprite contents there.
2012-08-03 11:50:33 -04:00
Kristian Høgsberg
65a11e1039 compositor: Accumulate damage per plane
When we analyze and accumulate damage prior to repainting, we need to
accumulate damage per plane, so that whatever damage a surface
contributes is accumulated in the plane that it's assigned to.  Before,
we would always accumulate damge in the primary plane, which caused
repaints in the primary plane whenever a surface in a sprite or
framebuffer was damaged.  Eliminating this repaint is a big win for
cases where we pageflip to a client surface or use a sprite overlay.

This also prepares for fixing the missing cursor updates, since we
now track damage to the cursor surface in a dedicated sprite plane.
2012-08-03 11:30:21 -04:00
Scott Moreau
c50645c775 Properly free drm configured mode variables. 2012-08-01 00:41:28 -04:00
Kristian Høgsberg
64eca8949b compositor: Fold the log prototypes into compositor.h and drop log.h
We're trying to keep the API exposed by the core compositor in compositor.h
2012-08-01 00:00:57 -04:00
Scott Moreau
8f37e0bc1e Add raw modeline support.
This allows specifying a modeline in the config for the 'mode' key
in the output section, such as one you would get from cvt.
2012-07-31 22:38:21 -04:00
Kristian Høgsberg
8ff691593c compositor-drm: Handle incomplete [output] sections without crashing 2012-07-31 22:18:28 -04:00
Kristian Høgsberg
7b884bc0de compositor: Use a minimal restore handler for crash clean up
When we hit a segv, it's often the case that we might crash again in
the attempt to clean up.  Instead we introduce a minimal restore callback
in the backend abstraction, that shuts down as simply as possible.  Then
we can call that from the segv handler, and then to aid debugging, we
raise SIGTRAP in the segv handler.  This lets us run gdb on weston from
a different vt, and if we tell gdb

  (gdb) handle SIGSEGV nostop

gdb won't stop when the segv happens but let weston clean up and switch vt,
and then stop when SIGTRAP is raised.

It's also possible to just let gdb catch the segv, and then use sysrq+k
followed by manual vt switch to get back.
2012-07-31 14:32:01 -04:00
Scott Moreau
8ab5d45399 Allow output configuration from config file.
Parse the config file for [output] sections and check for 'name'
and 'mode' keys. The key strings are compared to what is reported
by weston log. The 'mode' key string can be one of the following:

1) WIDTHxHEIGHT - one that is reported by weston log
2) off - Disables the output
3) preferred - Uses the preferred mode
4) current - Uses the mode currently driving the crtc
2012-07-30 21:56:13 -04:00
Wang Quanxian
acb805a356 compositor-drm: Handle unconnected connectors better
If a connector is not attached to a crtc, weston fails to bring it up.
Typically kms fbdev drives all crtc and connectors, but if kms hasn't been
initialzed and weston is the first to set a mode of if a monitor is
hotplugged, we just fail to bring it up.

(krh: reformatted and edited a bit from original patch)
2012-07-30 18:09:46 -04:00
Kristian Høgsberg
148ef0124f compositor-drm: Don't leak output->name 2012-07-26 23:04:37 -04:00
Kristian Høgsberg
9ca38464cb compositor-drm: Look through all crtc/encoder combinations
We used to only check the first possible encoder, now we go through all
possible encoders and look through all possible crtcs for each encoder.
2012-07-26 22:44:55 -04:00
Kristian Høgsberg
2f9ed71a8f compositor-drm: Assign unique output names like xrandr does 2012-07-26 17:57:15 -04:00
Kristian Høgsberg
70a11b131d compositor-drm: Remove cursor debug message 2012-07-18 17:23:41 -04:00
Kristian Høgsberg
1f5de35482 compositor-drm: Only update hw cursor contents when it changes
We avoid the memcpy, gbm_bo_write and the drmModeSetCursor ioctl per frame.
2012-07-18 15:52:14 -04:00
Kristian Høgsberg
24e4275c30 compositor-drm: Only call drmModeMoveCursor() if hw cursor position changed
Saves an ioctl per frame.
2012-07-18 15:52:14 -04:00
Kristian Høgsberg
4901f6ceea compositor-drm: Allocate hw cursor like other planes
We no longer reserve the hw cursor for just the pointer sprite.  Any
surface that satisfies the requirements for the hw cursor can be used.

Of course that's more or less always the pointer sprite, but at least now
we don't hard-code the references to compositor->seat anymore.
2012-07-16 16:44:24 -04:00
Kristian Høgsberg
a6edab3e23 compositor-drm: Combine drm_output_set_cursor and weston_output_set_cursor
weston_output_set_cursor was the left-over of a core compositor cursor
helper that we moved into compositor-drm.c.
2012-07-16 16:44:24 -04:00
Kristian Høgsberg
6143f7dfbd compositor-drm: Assign primary framebuffer in assign_planes callout
Determining whether it was possible to use a surface buffer as the
primary framebuffer was always a bit of a hack.  Just before rendering,
we look at the second top-most surface to see if it's the right size and
position and then use it if it is.  If we have a hw cursor and a drm
plane on top, it's no longer the second top-most and it wouldn't be picked
even if it could work.

With this change, we inspect surfaces in drm_assign_planes and try to find
a candidate for the primary fb there.  We track the overlap like for
overlays and if there is a surface that's not overlapped and fills the
output we pick it.

This commit also consolidate the logic to track damage as we move a surface
in and out of the primary plane, which was missing in the drm plane case.
2012-07-16 16:44:23 -04:00
Kristian Høgsberg
3b00bae996 compositor-drm: Support hardware scaling with drm planes
The kms planes support scaling, so try to detect transformations that
are just translations + scaling and program the kms plane accordingly.

In particular, this lets us fullscreen a yuv surfaces with the scale method
and have the compositor use a kms plane for scaling and color conversion.
2012-07-16 16:44:23 -04:00
Kristian Høgsberg
270a7cb02d compositor-drm: Follow gbm_bo_get_pitch rename to gbm_bo_get_stride
It was always a confusing mis-nomer, fix it while we can.
2012-07-16 16:44:16 -04:00
Kristian Høgsberg
2763a2e94e compositor-drm: Use gbm_bo_import instead of gbm_bo_create_from_egl_surface
This lets us create the gbm bo from the wl_buffer instead of the
EGLImage.  With planar buffer, the EGLImage corresponds to a plane
and not the entire planar buffer.

More importantly, with some YUV formats (packed YUYV and similar) we use
several EGLImages to sample the different components, but KMS only
want one plane in that case.
2012-07-16 16:40:29 -04:00
Gwenole Beauchesne
023f855f8d compositor: prepare for multi-planar surfaces.
Make weston_surface::texture and ::surface an array, while keeping
[0] for RGB surfaces.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
2012-07-10 15:44:33 -04:00
Kristian Høgsberg
061c425331 compositor-drm: Improve initial mode picking
We now pick the driver preferred mode for our initial mode.  If no preferred
mode is available we default to the current mode.  We also have a command
line option now to keep the current mode if it differs from the preferred.

This commit also drops the built-in mode and insteade uses the current mode
if the connector doesn't report any modes.
2012-06-28 11:47:42 -04:00
Ander Conselvan de Oliveira
01a57ed506 compositor-drm: Don't leak FBs when the buffer of a sprite is detroyed
As a side effect, the overlay is disabled when the buffer is destroyed.
2012-06-26 10:25:24 -04:00
Ander Conselvan de Oliveira
fd1f4c650f compositor-drm: Remove destroy listeners when disabling planes
When an unused plane is disabled, the destroy listener for a previously
used buffer needs to be removed. This fixes a crash when an overlay
would be reenabled using the same buffer as before, causing the destroy
listener to be inserted twice.
2012-06-26 10:24:46 -04:00
Ander Conselvan de Oliveira
a73269637f compositor-drm: Wait for vblank events before starting next frame
Besides the fact of the frame not being done, assigning planes before
the vblank handler is called will make the state inconsistent, leading
to a crash.
2012-06-26 10:24:27 -04:00
Ander Conselvan de Oliveira
d450b1901f compositor-drm: Check surface's outputs when assigning overlays
Check if the output passed to drm_output_prepare_overlay_surface() does
actually contain the surface and fail if it doesn't. Also fail if a
surface spans multiple outputs since clearing the damage will cause the
portion that is not in an overlay to not be updated at all.
2012-06-26 10:21:49 -04:00
Daniel Stone
a96b93c3bd compositor-drm: Add proper error handling to init
This way, if initialisation fails (say, udev or Mesa are broken, or we
couldn't find any devices), we'll at least take you back to where you
were, rather than leave you at a totally broken VT you can't escape
from.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 11:52:08 -04:00
Daniel Stone
725c2c3d68 Split weston_compositor_init into base and _gl
weston_compositor_init is always called late because most
implementations can't initialise GL until fairly late in the game.
Split it into a base version with the same name, followed by
weston_compositor_init_gl which can be called later on.

This simplifies compositor-wayland, which no longer needs a separate
global handler just for wl_seat.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2012-06-22 11:52:08 -04:00
Kristian Høgsberg
f2735ea8af compositor-drm: Hide hw cursor if cursor sprite isn't mapped 2012-06-20 23:03:53 -04:00
Kristian Høgsberg
49952d1f12 compositor: Introduce weston_output_schedule_repaint()
This lets us schedule a repaint on just the output that needs it.
2012-06-20 00:38:20 -04:00