2010-06-11 20:56:24 +04:00
|
|
|
/*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* Copyright © 2008-2011 Kristian Høgsberg
|
|
|
|
* Copyright © 2011 Intel Corporation
|
2010-06-11 20:56:24 +04:00
|
|
|
*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and
|
|
|
|
* its documentation for any purpose is hereby granted without fee, provided
|
|
|
|
* that the above copyright notice appear in all copies and that both that
|
|
|
|
* copyright notice and this permission notice appear in supporting
|
|
|
|
* documentation, and that the name of the copyright holders not be used in
|
|
|
|
* advertising or publicity pertaining to distribution of the software
|
|
|
|
* without specific, written prior permission. The copyright holders make
|
|
|
|
* no representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
2010-06-11 20:56:24 +04:00
|
|
|
*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
|
|
|
* SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
|
|
* FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
|
|
* SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
|
|
|
|
* RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
|
|
|
|
* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
2010-06-11 20:56:24 +04:00
|
|
|
*/
|
|
|
|
|
2013-05-02 00:52:13 +04:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include <config.h>
|
|
|
|
#endif
|
|
|
|
|
2011-04-12 19:34:32 +04:00
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
#include <errno.h>
|
2010-06-11 20:56:24 +04:00
|
|
|
#include <stdlib.h>
|
2013-04-24 17:58:02 +04:00
|
|
|
#include <ctype.h>
|
2010-06-11 20:56:24 +04:00
|
|
|
#include <string.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
2012-04-10 08:11:50 +04:00
|
|
|
#include <linux/input.h>
|
2012-06-26 18:09:14 +04:00
|
|
|
#include <assert.h>
|
2013-01-25 17:13:04 +04:00
|
|
|
#include <sys/mman.h>
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2011-03-02 13:56:04 +03:00
|
|
|
#include <xf86drm.h>
|
|
|
|
#include <xf86drmMode.h>
|
2012-02-23 18:45:49 +04:00
|
|
|
#include <drm_fourcc.h>
|
2011-03-02 13:56:04 +03:00
|
|
|
|
2011-04-30 11:32:11 +04:00
|
|
|
#include <gbm.h>
|
2012-02-29 21:53:50 +04:00
|
|
|
#include <libbacklight.h>
|
2012-08-03 21:30:30 +04:00
|
|
|
#include <libudev.h>
|
2011-04-30 11:32:11 +04:00
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
#include "compositor.h"
|
2012-11-13 22:10:28 +04:00
|
|
|
#include "gl-renderer.h"
|
2013-01-25 17:13:05 +04:00
|
|
|
#include "pixman-renderer.h"
|
2013-02-19 01:15:53 +04:00
|
|
|
#include "udev-seat.h"
|
2012-01-30 17:04:04 +04:00
|
|
|
#include "launcher-util.h"
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2012-06-28 19:28:15 +04:00
|
|
|
static int option_current_mode = 0;
|
2012-07-31 05:51:08 +04:00
|
|
|
static char *output_name;
|
|
|
|
static char *output_mode;
|
2012-08-18 11:04:05 +04:00
|
|
|
static char *output_transform;
|
2012-07-31 05:51:08 +04:00
|
|
|
static struct wl_list configured_output_list;
|
|
|
|
|
|
|
|
enum output_config {
|
|
|
|
OUTPUT_CONFIG_INVALID = 0,
|
|
|
|
OUTPUT_CONFIG_OFF,
|
|
|
|
OUTPUT_CONFIG_PREFERRED,
|
|
|
|
OUTPUT_CONFIG_CURRENT,
|
2012-08-01 01:30:41 +04:00
|
|
|
OUTPUT_CONFIG_MODE,
|
|
|
|
OUTPUT_CONFIG_MODELINE
|
2012-07-31 05:51:08 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct drm_configured_output {
|
|
|
|
char *name;
|
|
|
|
char *mode;
|
2012-08-18 11:04:05 +04:00
|
|
|
uint32_t transform;
|
2012-07-31 05:51:08 +04:00
|
|
|
int32_t width, height;
|
2012-08-01 01:30:41 +04:00
|
|
|
drmModeModeInfo crtc_mode;
|
2012-07-31 05:51:08 +04:00
|
|
|
enum output_config config;
|
|
|
|
struct wl_list link;
|
|
|
|
};
|
2012-06-28 19:28:15 +04:00
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
struct drm_compositor {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor base;
|
2010-06-14 19:54:00 +04:00
|
|
|
|
|
|
|
struct udev *udev;
|
|
|
|
struct wl_event_source *drm_source;
|
|
|
|
|
2011-03-15 17:08:41 +03:00
|
|
|
struct udev_monitor *udev_monitor;
|
|
|
|
struct wl_event_source *udev_drm_source;
|
|
|
|
|
2011-03-02 13:14:59 +03:00
|
|
|
struct {
|
2012-03-11 23:05:21 +04:00
|
|
|
int id;
|
2011-03-02 13:14:59 +03:00
|
|
|
int fd;
|
|
|
|
} drm;
|
2011-04-30 11:32:11 +04:00
|
|
|
struct gbm_device *gbm;
|
2012-02-23 18:45:49 +04:00
|
|
|
uint32_t *crtcs;
|
|
|
|
int num_crtcs;
|
2011-02-10 03:01:42 +03:00
|
|
|
uint32_t crtc_allocator;
|
2011-03-15 17:08:41 +03:00
|
|
|
uint32_t connector_allocator;
|
2011-01-14 22:59:13 +03:00
|
|
|
struct tty *tty;
|
2011-12-02 15:07:27 +04:00
|
|
|
|
2012-08-09 23:18:28 +04:00
|
|
|
/* we need these parameters in order to not fail drmModeAddFB2()
|
|
|
|
* due to out of bounds dimensions, and then mistakenly set
|
|
|
|
* sprites_are_broken:
|
|
|
|
*/
|
2012-11-09 16:19:05 +04:00
|
|
|
uint32_t min_width, max_width;
|
|
|
|
uint32_t min_height, max_height;
|
|
|
|
int no_addfb2;
|
2012-08-09 23:18:28 +04:00
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
struct wl_list sprite_list;
|
2012-03-06 04:57:35 +04:00
|
|
|
int sprites_are_broken;
|
2012-10-31 19:55:46 +04:00
|
|
|
int sprites_hidden;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-08-09 22:24:45 +04:00
|
|
|
int cursors_are_broken;
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
int use_pixman;
|
|
|
|
|
2011-12-02 15:07:27 +04:00
|
|
|
uint32_t prev_state;
|
2010-06-14 19:54:00 +04:00
|
|
|
};
|
|
|
|
|
2011-06-21 19:16:58 +04:00
|
|
|
struct drm_mode {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_mode base;
|
2011-06-21 19:16:58 +04:00
|
|
|
drmModeModeInfo mode_info;
|
|
|
|
};
|
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
struct drm_output;
|
|
|
|
|
|
|
|
struct drm_fb {
|
|
|
|
struct drm_output *output;
|
2013-01-25 17:13:04 +04:00
|
|
|
uint32_t fb_id, stride, handle, size;
|
|
|
|
int fd;
|
2012-05-02 17:42:21 +04:00
|
|
|
int is_client_buffer;
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
struct weston_buffer_reference buffer_ref;
|
2013-01-25 17:13:04 +04:00
|
|
|
|
|
|
|
/* Used by gbm fbs */
|
|
|
|
struct gbm_bo *bo;
|
|
|
|
|
|
|
|
/* Used by dumb fbs */
|
|
|
|
void *map;
|
2012-05-02 17:42:21 +04:00
|
|
|
};
|
|
|
|
|
2013-04-24 17:58:02 +04:00
|
|
|
struct drm_edid {
|
|
|
|
char eisa_id[13];
|
|
|
|
char monitor_name[13];
|
|
|
|
char pnp_id[5];
|
|
|
|
char serial_number[13];
|
|
|
|
};
|
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
struct drm_output {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output base;
|
2010-06-14 19:54:00 +04:00
|
|
|
|
2012-07-27 01:57:15 +04:00
|
|
|
char *name;
|
2010-06-14 19:54:00 +04:00
|
|
|
uint32_t crtc_id;
|
2012-08-09 05:27:37 +04:00
|
|
|
int pipe;
|
2010-06-14 19:54:00 +04:00
|
|
|
uint32_t connector_id;
|
2011-08-30 00:52:23 +04:00
|
|
|
drmModeCrtcPtr original_crtc;
|
2013-04-24 17:58:02 +04:00
|
|
|
struct drm_edid edid;
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-06-26 18:09:13 +04:00
|
|
|
int vblank_pending;
|
|
|
|
int page_flip_pending;
|
|
|
|
|
2012-03-12 02:27:41 +04:00
|
|
|
struct gbm_surface *surface;
|
2012-05-03 19:39:35 +04:00
|
|
|
struct gbm_bo *cursor_bo[2];
|
2012-08-03 19:30:18 +04:00
|
|
|
struct weston_plane cursor_plane;
|
|
|
|
struct weston_plane fb_plane;
|
2012-08-03 19:50:05 +04:00
|
|
|
struct weston_surface *cursor_surface;
|
|
|
|
int current_cursor;
|
2012-05-02 17:42:21 +04:00
|
|
|
struct drm_fb *current, *next;
|
2012-02-29 21:53:50 +04:00
|
|
|
struct backlight *backlight;
|
2013-01-25 17:13:05 +04:00
|
|
|
|
|
|
|
struct drm_fb *dumb[2];
|
|
|
|
pixman_image_t *image[2];
|
|
|
|
int current_image;
|
|
|
|
pixman_region32_t previous_damage;
|
2010-06-14 19:54:00 +04:00
|
|
|
};
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
/*
|
|
|
|
* An output has a primary display plane plus zero or more sprites for
|
|
|
|
* blending display contents.
|
|
|
|
*/
|
|
|
|
struct drm_sprite {
|
|
|
|
struct wl_list link;
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
struct weston_plane plane;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
struct drm_fb *current, *next;
|
2012-06-26 18:09:13 +04:00
|
|
|
struct drm_output *output;
|
2012-02-23 18:45:49 +04:00
|
|
|
struct drm_compositor *compositor;
|
|
|
|
|
|
|
|
uint32_t possible_crtcs;
|
|
|
|
uint32_t plane_id;
|
|
|
|
uint32_t count_formats;
|
|
|
|
|
|
|
|
int32_t src_x, src_y;
|
|
|
|
uint32_t src_w, src_h;
|
|
|
|
uint32_t dest_x, dest_y;
|
|
|
|
uint32_t dest_w, dest_h;
|
|
|
|
|
|
|
|
uint32_t formats[];
|
|
|
|
};
|
|
|
|
|
2013-02-19 01:15:53 +04:00
|
|
|
static const char default_seat[] = "seat0";
|
2012-08-03 21:30:30 +04:00
|
|
|
|
2012-08-03 19:50:05 +04:00
|
|
|
static void
|
|
|
|
drm_output_set_cursor(struct drm_output *output);
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
static int
|
|
|
|
drm_sprite_crtc_supported(struct weston_output *output_base, uint32_t supported)
|
|
|
|
{
|
|
|
|
struct weston_compositor *ec = output_base->compositor;
|
|
|
|
struct drm_compositor *c =(struct drm_compositor *) ec;
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
int crtc;
|
|
|
|
|
|
|
|
for (crtc = 0; crtc < c->num_crtcs; crtc++) {
|
|
|
|
if (c->crtcs[crtc] != output->crtc_id)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (supported & (1 << crtc))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
static void
|
|
|
|
drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
|
|
|
|
{
|
|
|
|
struct drm_fb *fb = data;
|
|
|
|
struct gbm_device *gbm = gbm_bo_get_device(bo);
|
|
|
|
|
|
|
|
if (fb->fb_id)
|
|
|
|
drmModeRmFB(gbm_device_get_fd(gbm), fb->fb_id);
|
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
weston_buffer_reference(&fb->buffer_ref, NULL);
|
2012-05-02 17:42:21 +04:00
|
|
|
|
|
|
|
free(data);
|
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:04 +04:00
|
|
|
static struct drm_fb *
|
|
|
|
drm_fb_create_dumb(struct drm_compositor *ec, unsigned width, unsigned height)
|
|
|
|
{
|
|
|
|
struct drm_fb *fb;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
struct drm_mode_create_dumb create_arg;
|
|
|
|
struct drm_mode_destroy_dumb destroy_arg;
|
|
|
|
struct drm_mode_map_dumb map_arg;
|
|
|
|
|
|
|
|
fb = calloc(1, sizeof *fb);
|
|
|
|
if (!fb)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
create_arg.bpp = 32;
|
|
|
|
create_arg.width = width;
|
|
|
|
create_arg.height = height;
|
|
|
|
|
|
|
|
ret = drmIoctl(ec->drm.fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_arg);
|
|
|
|
if (ret)
|
|
|
|
goto err_fb;
|
|
|
|
|
|
|
|
fb->handle = create_arg.handle;
|
|
|
|
fb->stride = create_arg.pitch;
|
|
|
|
fb->size = create_arg.size;
|
|
|
|
fb->fd = ec->drm.fd;
|
|
|
|
|
|
|
|
ret = drmModeAddFB(ec->drm.fd, width, height, 24, 32,
|
|
|
|
fb->stride, fb->handle, &fb->fb_id);
|
|
|
|
if (ret)
|
|
|
|
goto err_bo;
|
|
|
|
|
|
|
|
memset(&map_arg, 0, sizeof(map_arg));
|
|
|
|
map_arg.handle = fb->handle;
|
|
|
|
drmIoctl(fb->fd, DRM_IOCTL_MODE_MAP_DUMB, &map_arg);
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
goto err_add_fb;
|
|
|
|
|
|
|
|
fb->map = mmap(0, fb->size, PROT_WRITE,
|
|
|
|
MAP_SHARED, ec->drm.fd, map_arg.offset);
|
|
|
|
if (fb->map == MAP_FAILED)
|
|
|
|
goto err_add_fb;
|
|
|
|
|
|
|
|
return fb;
|
|
|
|
|
|
|
|
err_add_fb:
|
|
|
|
drmModeRmFB(ec->drm.fd, fb->fb_id);
|
|
|
|
err_bo:
|
|
|
|
memset(&destroy_arg, 0, sizeof(destroy_arg));
|
|
|
|
destroy_arg.handle = create_arg.handle;
|
|
|
|
drmIoctl(ec->drm.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_arg);
|
|
|
|
err_fb:
|
|
|
|
free(fb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
drm_fb_destroy_dumb(struct drm_fb *fb)
|
|
|
|
{
|
|
|
|
struct drm_mode_destroy_dumb destroy_arg;
|
|
|
|
|
|
|
|
if (!fb->map)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (fb->fb_id)
|
|
|
|
drmModeRmFB(fb->fd, fb->fb_id);
|
|
|
|
|
|
|
|
weston_buffer_reference(&fb->buffer_ref, NULL);
|
|
|
|
|
|
|
|
munmap(fb->map, fb->size);
|
|
|
|
|
|
|
|
memset(&destroy_arg, 0, sizeof(destroy_arg));
|
|
|
|
destroy_arg.handle = fb->handle;
|
|
|
|
drmIoctl(fb->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_arg);
|
|
|
|
|
|
|
|
free(fb);
|
|
|
|
}
|
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
static struct drm_fb *
|
2012-12-07 21:37:58 +04:00
|
|
|
drm_fb_get_from_bo(struct gbm_bo *bo,
|
|
|
|
struct drm_compositor *compositor, uint32_t format)
|
2012-05-02 17:42:21 +04:00
|
|
|
{
|
|
|
|
struct drm_fb *fb = gbm_bo_get_user_data(bo);
|
2013-01-25 17:13:04 +04:00
|
|
|
uint32_t width, height;
|
2012-11-09 16:19:05 +04:00
|
|
|
uint32_t handles[4], pitches[4], offsets[4];
|
2012-05-02 17:42:21 +04:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (fb)
|
|
|
|
return fb;
|
|
|
|
|
2013-01-25 17:13:04 +04:00
|
|
|
fb = calloc(1, sizeof *fb);
|
|
|
|
if (!fb)
|
|
|
|
return NULL;
|
2012-05-02 17:42:21 +04:00
|
|
|
|
|
|
|
fb->bo = bo;
|
|
|
|
|
|
|
|
width = gbm_bo_get_width(bo);
|
|
|
|
height = gbm_bo_get_height(bo);
|
2013-01-25 17:13:04 +04:00
|
|
|
fb->stride = gbm_bo_get_stride(bo);
|
|
|
|
fb->handle = gbm_bo_get_handle(bo).u32;
|
|
|
|
fb->size = fb->stride * height;
|
|
|
|
fb->fd = compositor->drm.fd;
|
2012-05-02 17:42:21 +04:00
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
if (compositor->min_width > width || width > compositor->max_width ||
|
|
|
|
compositor->min_height > height ||
|
|
|
|
height > compositor->max_height) {
|
|
|
|
weston_log("bo geometry out of bounds\n");
|
|
|
|
goto err_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = -1;
|
|
|
|
|
|
|
|
if (format && !compositor->no_addfb2) {
|
2013-01-25 17:13:04 +04:00
|
|
|
handles[0] = fb->handle;
|
|
|
|
pitches[0] = fb->stride;
|
2012-11-09 16:19:05 +04:00
|
|
|
offsets[0] = 0;
|
|
|
|
|
|
|
|
ret = drmModeAddFB2(compositor->drm.fd, width, height,
|
|
|
|
format, handles, pitches, offsets,
|
|
|
|
&fb->fb_id, 0);
|
|
|
|
if (ret) {
|
|
|
|
weston_log("addfb2 failed: %m\n");
|
|
|
|
compositor->no_addfb2 = 1;
|
|
|
|
compositor->sprites_are_broken = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
ret = drmModeAddFB(compositor->drm.fd, width, height, 24, 32,
|
2013-01-25 17:13:04 +04:00
|
|
|
fb->stride, fb->handle, &fb->fb_id);
|
2012-11-09 16:19:05 +04:00
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
if (ret) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to create kms fb: %m\n");
|
2012-11-09 16:19:05 +04:00
|
|
|
goto err_free;
|
2012-05-02 17:42:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
gbm_bo_set_user_data(bo, fb, drm_fb_destroy_callback);
|
|
|
|
|
|
|
|
return fb;
|
2012-11-09 16:19:05 +04:00
|
|
|
|
|
|
|
err_free:
|
|
|
|
free(fb);
|
|
|
|
return NULL;
|
2012-05-02 17:42:21 +04:00
|
|
|
}
|
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
static void
|
|
|
|
drm_fb_set_buffer(struct drm_fb *fb, struct wl_buffer *buffer)
|
|
|
|
{
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
assert(fb->buffer_ref.buffer == NULL);
|
2012-11-09 16:19:05 +04:00
|
|
|
|
|
|
|
fb->is_client_buffer = 1;
|
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
weston_buffer_reference(&fb->buffer_ref, buffer);
|
2012-11-09 16:19:05 +04:00
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:03 +04:00
|
|
|
static void
|
|
|
|
drm_output_release_fb(struct drm_output *output, struct drm_fb *fb)
|
|
|
|
{
|
|
|
|
if (!fb)
|
|
|
|
return;
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (fb->map &&
|
|
|
|
(fb != output->dumb[0] && fb != output->dumb[1])) {
|
2013-01-25 17:13:04 +04:00
|
|
|
drm_fb_destroy_dumb(fb);
|
|
|
|
} else if (fb->bo) {
|
2013-01-25 17:13:03 +04:00
|
|
|
if (fb->is_client_buffer)
|
|
|
|
gbm_bo_destroy(fb->bo);
|
|
|
|
else
|
|
|
|
gbm_surface_release_buffer(output->surface,
|
|
|
|
output->current->bo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
static uint32_t
|
2012-11-30 19:34:22 +04:00
|
|
|
drm_output_check_scanout_format(struct drm_output *output,
|
|
|
|
struct weston_surface *es, struct gbm_bo *bo)
|
|
|
|
{
|
|
|
|
uint32_t format;
|
|
|
|
pixman_region32_t r;
|
|
|
|
|
|
|
|
format = gbm_bo_get_format(bo);
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
switch (format) {
|
|
|
|
case GBM_FORMAT_XRGB8888:
|
|
|
|
return format;
|
|
|
|
case GBM_FORMAT_ARGB8888:
|
2012-11-30 19:34:22 +04:00
|
|
|
/* We can only scanout an ARGB buffer if the surface's
|
|
|
|
* opaque region covers the whole output */
|
|
|
|
pixman_region32_init(&r);
|
|
|
|
pixman_region32_subtract(&r, &output->base.region,
|
|
|
|
&es->opaque);
|
|
|
|
|
|
|
|
if (!pixman_region32_not_empty(&r))
|
2012-12-07 21:37:58 +04:00
|
|
|
format = GBM_FORMAT_XRGB8888;
|
|
|
|
else
|
|
|
|
format = 0;
|
2012-11-30 19:34:22 +04:00
|
|
|
|
|
|
|
pixman_region32_fini(&r);
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
return format;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
2012-11-30 19:34:22 +04:00
|
|
|
}
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
static struct weston_plane *
|
2012-07-14 08:31:32 +04:00
|
|
|
drm_output_prepare_scanout_surface(struct weston_output *_output,
|
|
|
|
struct weston_surface *es)
|
2012-01-26 08:59:42 +04:00
|
|
|
{
|
2012-07-14 08:31:32 +04:00
|
|
|
struct drm_output *output = (struct drm_output *) _output;
|
2012-01-26 08:59:42 +04:00
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output->base.compositor;
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
struct wl_buffer *buffer = es->buffer_ref.buffer;
|
2012-05-02 17:42:21 +04:00
|
|
|
struct gbm_bo *bo;
|
2012-12-07 21:37:58 +04:00
|
|
|
uint32_t format;
|
2012-01-26 08:59:42 +04:00
|
|
|
|
2012-02-17 19:45:16 +04:00
|
|
|
if (es->geometry.x != output->base.x ||
|
2012-01-25 18:22:05 +04:00
|
|
|
es->geometry.y != output->base.y ||
|
2013-01-25 17:13:05 +04:00
|
|
|
buffer == NULL || c->gbm == NULL ||
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
buffer->width != output->base.current->width ||
|
|
|
|
buffer->height != output->base.current->height ||
|
2012-11-27 19:03:43 +04:00
|
|
|
output->base.transform != es->buffer_transform ||
|
|
|
|
es->transform.enabled)
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-01-26 08:59:42 +04:00
|
|
|
|
2012-07-14 06:54:43 +04:00
|
|
|
bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
buffer, GBM_BO_USE_SCANOUT);
|
2012-05-02 17:42:21 +04:00
|
|
|
|
2012-09-15 02:25:41 +04:00
|
|
|
/* Unable to use the buffer for scanout */
|
|
|
|
if (!bo)
|
|
|
|
return NULL;
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
format = drm_output_check_scanout_format(output, es, bo);
|
|
|
|
if (format == 0) {
|
2012-05-02 17:42:22 +04:00
|
|
|
gbm_bo_destroy(bo);
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-05-02 17:42:22 +04:00
|
|
|
}
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
output->next = drm_fb_get_from_bo(bo, c, format);
|
2012-05-02 17:42:21 +04:00
|
|
|
if (!output->next) {
|
|
|
|
gbm_bo_destroy(bo);
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-05-02 17:42:21 +04:00
|
|
|
}
|
2012-01-26 08:59:42 +04:00
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
drm_fb_set_buffer(output->next, buffer);
|
2012-01-26 08:59:42 +04:00
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
return &output->fb_plane;
|
2012-01-26 08:59:42 +04:00
|
|
|
}
|
|
|
|
|
2012-03-12 02:27:41 +04:00
|
|
|
static void
|
2013-01-25 17:13:05 +04:00
|
|
|
drm_output_render_gl(struct drm_output *output, pixman_region32_t *damage)
|
2012-03-12 02:27:41 +04:00
|
|
|
{
|
2012-11-09 16:19:05 +04:00
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output->base.compositor;
|
2012-05-02 17:42:21 +04:00
|
|
|
struct gbm_bo *bo;
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
c->base.renderer->repaint_output(&output->base, damage);
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
bo = gbm_surface_lock_front_buffer(output->surface);
|
|
|
|
if (!bo) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to lock front buffer: %m\n");
|
2012-03-12 02:27:41 +04:00
|
|
|
return;
|
|
|
|
}
|
2012-05-02 17:42:21 +04:00
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
output->next = drm_fb_get_from_bo(bo, c, GBM_FORMAT_XRGB8888);
|
2012-05-02 17:42:21 +04:00
|
|
|
if (!output->next) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to get drm_fb for bo\n");
|
2012-05-02 17:42:21 +04:00
|
|
|
gbm_surface_release_buffer(output->surface, bo);
|
|
|
|
return;
|
|
|
|
}
|
2012-03-12 02:27:41 +04:00
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
static void
|
|
|
|
drm_output_render_pixman(struct drm_output *output, pixman_region32_t *damage)
|
|
|
|
{
|
|
|
|
struct weston_compositor *ec = output->base.compositor;
|
|
|
|
pixman_region32_t total_damage, previous_damage;
|
|
|
|
|
|
|
|
pixman_region32_init(&total_damage);
|
|
|
|
pixman_region32_init(&previous_damage);
|
|
|
|
|
|
|
|
pixman_region32_copy(&previous_damage, damage);
|
|
|
|
|
|
|
|
pixman_region32_union(&total_damage, damage, &output->previous_damage);
|
|
|
|
pixman_region32_copy(&output->previous_damage, &previous_damage);
|
|
|
|
|
|
|
|
output->current_image ^= 1;
|
|
|
|
|
|
|
|
output->next = output->dumb[output->current_image];
|
|
|
|
pixman_renderer_output_set_buffer(&output->base,
|
|
|
|
output->image[output->current_image]);
|
|
|
|
|
|
|
|
ec->renderer->repaint_output(&output->base, &total_damage);
|
|
|
|
|
|
|
|
pixman_region32_fini(&total_damage);
|
|
|
|
pixman_region32_fini(&previous_damage);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
drm_output_render(struct drm_output *output, pixman_region32_t *damage)
|
|
|
|
{
|
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output->base.compositor;
|
|
|
|
|
|
|
|
if (c->use_pixman)
|
|
|
|
drm_output_render_pixman(output, damage);
|
|
|
|
else
|
|
|
|
drm_output_render_gl(output, damage);
|
|
|
|
|
|
|
|
pixman_region32_subtract(&c->base.primary_plane.damage,
|
|
|
|
&c->base.primary_plane.damage, damage);
|
|
|
|
}
|
|
|
|
|
2013-05-02 00:52:12 +04:00
|
|
|
static void
|
|
|
|
drm_output_set_gamma(struct weston_output *output_base,
|
|
|
|
uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
struct drm_compositor *compositor = (struct drm_compositor *) output->base.compositor;
|
|
|
|
|
|
|
|
/* check */
|
|
|
|
if (output_base->gamma_size != size)
|
|
|
|
return;
|
|
|
|
if (!output->original_crtc)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rc = drmModeCrtcSetGamma(compositor->drm.fd,
|
|
|
|
output->crtc_id,
|
|
|
|
size, r, g, b);
|
|
|
|
if (rc)
|
|
|
|
weston_log("set gamma failed: %m\n");
|
|
|
|
}
|
|
|
|
|
2012-01-26 08:47:45 +04:00
|
|
|
static void
|
2012-02-29 07:31:58 +04:00
|
|
|
drm_output_repaint(struct weston_output *output_base,
|
2012-09-06 05:54:15 +04:00
|
|
|
pixman_region32_t *damage)
|
2011-03-11 18:39:20 +03:00
|
|
|
{
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
2012-01-26 08:47:45 +04:00
|
|
|
struct drm_compositor *compositor =
|
|
|
|
(struct drm_compositor *) output->base.compositor;
|
2012-02-23 18:45:49 +04:00
|
|
|
struct drm_sprite *s;
|
2012-03-12 02:27:41 +04:00
|
|
|
struct drm_mode *mode;
|
2012-02-23 18:45:49 +04:00
|
|
|
int ret = 0;
|
2011-03-11 18:39:20 +03:00
|
|
|
|
2012-05-02 17:42:21 +04:00
|
|
|
if (!output->next)
|
2012-09-06 05:54:15 +04:00
|
|
|
drm_output_render(output, damage);
|
2012-05-02 17:42:21 +04:00
|
|
|
if (!output->next)
|
2012-03-12 02:27:41 +04:00
|
|
|
return;
|
2010-06-14 19:54:00 +04:00
|
|
|
|
2012-03-12 02:27:41 +04:00
|
|
|
mode = container_of(output->base.current, struct drm_mode, base);
|
2012-05-02 17:42:21 +04:00
|
|
|
if (!output->current) {
|
2012-03-12 02:27:41 +04:00
|
|
|
ret = drmModeSetCrtc(compositor->drm.fd, output->crtc_id,
|
2012-05-02 17:42:21 +04:00
|
|
|
output->next->fb_id, 0, 0,
|
2012-03-12 02:27:41 +04:00
|
|
|
&output->connector_id, 1,
|
|
|
|
&mode->mode_info);
|
|
|
|
if (ret) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("set mode failed: %m\n");
|
2012-03-12 02:27:41 +04:00
|
|
|
return;
|
|
|
|
}
|
2011-04-10 18:49:52 +04:00
|
|
|
}
|
|
|
|
|
2012-01-26 08:47:45 +04:00
|
|
|
if (drmModePageFlip(compositor->drm.fd, output->crtc_id,
|
2012-05-02 17:42:21 +04:00
|
|
|
output->next->fb_id,
|
2012-01-18 20:47:41 +04:00
|
|
|
DRM_MODE_PAGE_FLIP_EVENT, output) < 0) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("queueing pageflip failed: %m\n");
|
2012-01-26 08:47:45 +04:00
|
|
|
return;
|
2012-01-18 20:47:41 +04:00
|
|
|
}
|
2011-03-11 18:39:20 +03:00
|
|
|
|
2012-06-26 18:09:13 +04:00
|
|
|
output->page_flip_pending = 1;
|
|
|
|
|
2012-08-03 19:50:05 +04:00
|
|
|
drm_output_set_cursor(output);
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
/*
|
|
|
|
* Now, update all the sprite surfaces
|
|
|
|
*/
|
|
|
|
wl_list_for_each(s, &compositor->sprite_list, link) {
|
2012-11-09 16:19:05 +04:00
|
|
|
uint32_t flags = 0, fb_id = 0;
|
2012-02-23 18:45:49 +04:00
|
|
|
drmVBlank vbl = {
|
|
|
|
.request.type = DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT,
|
|
|
|
.request.sequence = 1,
|
|
|
|
};
|
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
if ((!s->current && !s->next) ||
|
2012-11-09 16:19:03 +04:00
|
|
|
!drm_sprite_crtc_supported(output_base, s->possible_crtcs))
|
2012-02-23 18:45:49 +04:00
|
|
|
continue;
|
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
if (s->next && !compositor->sprites_hidden)
|
|
|
|
fb_id = s->next->fb_id;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
ret = drmModeSetPlane(compositor->drm.fd, s->plane_id,
|
2012-11-09 16:19:05 +04:00
|
|
|
output->crtc_id, fb_id, flags,
|
2012-02-23 18:45:49 +04:00
|
|
|
s->dest_x, s->dest_y,
|
|
|
|
s->dest_w, s->dest_h,
|
|
|
|
s->src_x, s->src_y,
|
|
|
|
s->src_w, s->src_h);
|
|
|
|
if (ret)
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("setplane failed: %d: %s\n",
|
2012-02-23 18:45:49 +04:00
|
|
|
ret, strerror(errno));
|
|
|
|
|
2012-08-09 05:27:37 +04:00
|
|
|
if (output->pipe > 0)
|
|
|
|
vbl.request.type |= DRM_VBLANK_SECONDARY;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
/*
|
|
|
|
* Queue a vblank signal so we know when the surface
|
|
|
|
* becomes active on the display or has been replaced.
|
|
|
|
*/
|
|
|
|
vbl.request.signal = (unsigned long)s;
|
|
|
|
ret = drmWaitVBlank(compositor->drm.fd, &vbl);
|
|
|
|
if (ret) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("vblank event request failed: %d: %s\n",
|
2012-02-23 18:45:49 +04:00
|
|
|
ret, strerror(errno));
|
|
|
|
}
|
2012-06-26 18:09:13 +04:00
|
|
|
|
|
|
|
s->output = output;
|
|
|
|
output->vblank_pending = 1;
|
2012-02-23 18:45:49 +04:00
|
|
|
}
|
|
|
|
|
2012-01-26 08:47:45 +04:00
|
|
|
return;
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
|
|
|
|
2013-04-06 01:07:11 +04:00
|
|
|
static void
|
|
|
|
drm_output_start_repaint_loop(struct weston_output *output_base)
|
|
|
|
{
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
struct drm_compositor *compositor = (struct drm_compositor *)
|
|
|
|
output_base->compositor;
|
|
|
|
uint32_t fb_id;
|
|
|
|
|
|
|
|
if (output->current)
|
|
|
|
fb_id = output->current->fb_id;
|
|
|
|
else
|
|
|
|
fb_id = output->original_crtc->buffer_id;
|
|
|
|
|
|
|
|
if (drmModePageFlip(compositor->drm.fd, output->crtc_id, fb_id,
|
|
|
|
DRM_MODE_PAGE_FLIP_EVENT, output) < 0) {
|
|
|
|
weston_log("queueing pageflip failed: %m\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
static void
|
|
|
|
vblank_handler(int fd, unsigned int frame, unsigned int sec, unsigned int usec,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct drm_sprite *s = (struct drm_sprite *)data;
|
2012-06-26 18:09:13 +04:00
|
|
|
struct drm_output *output = s->output;
|
|
|
|
uint32_t msecs;
|
|
|
|
|
|
|
|
output->vblank_pending = 0;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2013-01-25 17:13:03 +04:00
|
|
|
drm_output_release_fb(output, s->current);
|
2012-11-09 16:19:05 +04:00
|
|
|
s->current = s->next;
|
|
|
|
s->next = NULL;
|
2012-06-26 18:09:13 +04:00
|
|
|
|
|
|
|
if (!output->page_flip_pending) {
|
|
|
|
msecs = sec * 1000 + usec / 1000;
|
|
|
|
weston_output_finish_frame(&output->base, msecs);
|
|
|
|
}
|
2012-02-23 18:45:49 +04:00
|
|
|
}
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
static void
|
|
|
|
page_flip_handler(int fd, unsigned int frame,
|
|
|
|
unsigned int sec, unsigned int usec, void *data)
|
|
|
|
{
|
2011-04-10 18:49:52 +04:00
|
|
|
struct drm_output *output = (struct drm_output *) data;
|
2010-06-11 20:56:24 +04:00
|
|
|
uint32_t msecs;
|
|
|
|
|
2013-04-06 01:07:11 +04:00
|
|
|
/* We don't set page_flip_pending on start_repaint_loop, in that case
|
|
|
|
* we just want to page flip to the current buffer to get an accurate
|
|
|
|
* timestamp */
|
|
|
|
if (output->page_flip_pending) {
|
|
|
|
drm_output_release_fb(output, output->current);
|
|
|
|
output->current = output->next;
|
|
|
|
output->next = NULL;
|
|
|
|
}
|
2012-06-26 18:09:13 +04:00
|
|
|
|
2013-04-06 01:07:11 +04:00
|
|
|
output->page_flip_pending = 0;
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-06-26 18:09:13 +04:00
|
|
|
if (!output->vblank_pending) {
|
|
|
|
msecs = sec * 1000 + usec / 1000;
|
|
|
|
weston_output_finish_frame(&output->base, msecs);
|
|
|
|
}
|
2011-04-10 18:49:52 +04:00
|
|
|
}
|
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
static uint32_t
|
|
|
|
drm_output_check_sprite_format(struct drm_sprite *s,
|
|
|
|
struct weston_surface *es, struct gbm_bo *bo)
|
2012-02-23 18:45:49 +04:00
|
|
|
{
|
2012-12-07 21:37:58 +04:00
|
|
|
uint32_t i, format;
|
|
|
|
|
|
|
|
format = gbm_bo_get_format(bo);
|
|
|
|
|
|
|
|
if (format == GBM_FORMAT_ARGB8888) {
|
|
|
|
pixman_region32_t r;
|
|
|
|
|
2013-03-01 23:29:16 +04:00
|
|
|
pixman_region32_init_rect(&r, 0, 0,
|
|
|
|
es->geometry.width,
|
|
|
|
es->geometry.height);
|
|
|
|
pixman_region32_subtract(&r, &r, &es->opaque);
|
2012-12-07 21:37:58 +04:00
|
|
|
|
|
|
|
if (!pixman_region32_not_empty(&r))
|
|
|
|
format = GBM_FORMAT_XRGB8888;
|
|
|
|
|
|
|
|
pixman_region32_fini(&r);
|
|
|
|
}
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
for (i = 0; i < s->count_formats; i++)
|
|
|
|
if (s->formats[i] == format)
|
2012-12-07 21:37:58 +04:00
|
|
|
return format;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
drm_surface_transform_supported(struct weston_surface *es)
|
|
|
|
{
|
2013-01-30 01:56:15 +04:00
|
|
|
return !es->transform.enabled ||
|
|
|
|
(es->transform.matrix.type < WESTON_MATRIX_TRANSFORM_ROTATE);
|
2012-02-23 18:45:49 +04:00
|
|
|
}
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
static struct weston_plane *
|
2012-02-23 18:45:49 +04:00
|
|
|
drm_output_prepare_overlay_surface(struct weston_output *output_base,
|
2012-07-14 08:31:32 +04:00
|
|
|
struct weston_surface *es)
|
2012-02-23 18:45:49 +04:00
|
|
|
{
|
|
|
|
struct weston_compositor *ec = output_base->compositor;
|
|
|
|
struct drm_compositor *c =(struct drm_compositor *) ec;
|
|
|
|
struct drm_sprite *s;
|
|
|
|
int found = 0;
|
|
|
|
struct gbm_bo *bo;
|
|
|
|
pixman_region32_t dest_rect, src_rect;
|
2012-12-05 17:14:04 +04:00
|
|
|
pixman_box32_t *box, tbox;
|
2012-02-23 18:45:49 +04:00
|
|
|
uint32_t format;
|
2012-07-13 23:25:07 +04:00
|
|
|
wl_fixed_t sx1, sy1, sx2, sy2;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (c->gbm == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2012-12-05 17:14:04 +04:00
|
|
|
if (es->buffer_transform != output_base->transform)
|
2012-11-27 19:03:43 +04:00
|
|
|
return NULL;
|
|
|
|
|
2012-03-06 04:57:35 +04:00
|
|
|
if (c->sprites_are_broken)
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-03-06 04:57:35 +04:00
|
|
|
|
2012-06-26 18:09:12 +04:00
|
|
|
if (es->output_mask != (1u << output_base->id))
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-06-26 18:09:12 +04:00
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
if (es->buffer_ref.buffer == NULL)
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-11-16 13:48:46 +04:00
|
|
|
if (es->alpha != 1.0f)
|
|
|
|
return NULL;
|
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
if (wl_buffer_is_shm(es->buffer_ref.buffer))
|
2012-08-09 23:18:27 +04:00
|
|
|
return NULL;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
if (!drm_surface_transform_supported(es))
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
wl_list_for_each(s, &c->sprite_list, link) {
|
|
|
|
if (!drm_sprite_crtc_supported(output_base, s->possible_crtcs))
|
|
|
|
continue;
|
|
|
|
|
2012-11-09 16:19:05 +04:00
|
|
|
if (!s->next) {
|
2012-02-23 18:45:49 +04:00
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No sprites available */
|
|
|
|
if (!found)
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-07-14 06:54:43 +04:00
|
|
|
bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
es->buffer_ref.buffer, GBM_BO_USE_SCANOUT);
|
2012-07-14 06:54:43 +04:00
|
|
|
if (!bo)
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-07-14 06:54:43 +04:00
|
|
|
|
2012-12-07 21:37:58 +04:00
|
|
|
format = drm_output_check_sprite_format(s, es, bo);
|
|
|
|
if (format == 0) {
|
2012-11-09 16:19:05 +04:00
|
|
|
gbm_bo_destroy(bo);
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-11-09 16:19:05 +04:00
|
|
|
}
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-12-07 15:18:11 +04:00
|
|
|
s->next = drm_fb_get_from_bo(bo, c, format);
|
2012-11-09 16:19:05 +04:00
|
|
|
if (!s->next) {
|
|
|
|
gbm_bo_destroy(bo);
|
2012-08-03 19:30:18 +04:00
|
|
|
return NULL;
|
2012-02-23 18:45:49 +04:00
|
|
|
}
|
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
drm_fb_set_buffer(s->next, es->buffer_ref.buffer);
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
box = pixman_region32_extents(&es->transform.boundingbox);
|
|
|
|
s->plane.x = box->x1;
|
|
|
|
s->plane.y = box->y1;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
/*
|
|
|
|
* Calculate the source & dest rects properly based on actual
|
2012-09-29 17:13:56 +04:00
|
|
|
* position (note the caller has called weston_surface_update_transform()
|
2012-02-23 18:45:49 +04:00
|
|
|
* for us already).
|
|
|
|
*/
|
|
|
|
pixman_region32_init(&dest_rect);
|
|
|
|
pixman_region32_intersect(&dest_rect, &es->transform.boundingbox,
|
|
|
|
&output_base->region);
|
|
|
|
pixman_region32_translate(&dest_rect, -output_base->x, -output_base->y);
|
|
|
|
box = pixman_region32_extents(&dest_rect);
|
2012-12-05 17:14:04 +04:00
|
|
|
tbox = weston_transformed_rect(output_base->width,
|
|
|
|
output_base->height,
|
|
|
|
output_base->transform, *box);
|
|
|
|
s->dest_x = tbox.x1;
|
|
|
|
s->dest_y = tbox.y1;
|
|
|
|
s->dest_w = tbox.x2 - tbox.x1;
|
|
|
|
s->dest_h = tbox.y2 - tbox.y1;
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_fini(&dest_rect);
|
|
|
|
|
|
|
|
pixman_region32_init(&src_rect);
|
|
|
|
pixman_region32_intersect(&src_rect, &es->transform.boundingbox,
|
|
|
|
&output_base->region);
|
|
|
|
box = pixman_region32_extents(&src_rect);
|
2012-07-13 23:25:07 +04:00
|
|
|
|
|
|
|
weston_surface_from_global_fixed(es,
|
|
|
|
wl_fixed_from_int(box->x1),
|
|
|
|
wl_fixed_from_int(box->y1),
|
|
|
|
&sx1, &sy1);
|
|
|
|
weston_surface_from_global_fixed(es,
|
|
|
|
wl_fixed_from_int(box->x2),
|
|
|
|
wl_fixed_from_int(box->y2),
|
|
|
|
&sx2, &sy2);
|
|
|
|
|
|
|
|
if (sx1 < 0)
|
|
|
|
sx1 = 0;
|
|
|
|
if (sy1 < 0)
|
|
|
|
sy1 = 0;
|
|
|
|
if (sx2 > wl_fixed_from_int(es->geometry.width))
|
|
|
|
sx2 = wl_fixed_from_int(es->geometry.width);
|
|
|
|
if (sy2 > wl_fixed_from_int(es->geometry.height))
|
|
|
|
sy2 = wl_fixed_from_int(es->geometry.height);
|
|
|
|
|
2012-12-05 17:14:04 +04:00
|
|
|
tbox.x1 = sx1;
|
|
|
|
tbox.y1 = sy1;
|
|
|
|
tbox.x2 = sx2;
|
|
|
|
tbox.y2 = sy2;
|
|
|
|
|
|
|
|
tbox = weston_transformed_rect(wl_fixed_from_int(es->geometry.width),
|
|
|
|
wl_fixed_from_int(es->geometry.height),
|
|
|
|
es->buffer_transform, tbox);
|
|
|
|
|
|
|
|
s->src_x = tbox.x1 << 8;
|
|
|
|
s->src_y = tbox.y1 << 8;
|
|
|
|
s->src_w = (tbox.x2 - tbox.x1) << 8;
|
|
|
|
s->src_h = (tbox.y2 - tbox.y1) << 8;
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_fini(&src_rect);
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
return &s->plane;
|
2012-02-23 18:45:49 +04:00
|
|
|
}
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
static struct weston_plane *
|
2012-08-03 19:50:05 +04:00
|
|
|
drm_output_prepare_cursor_surface(struct weston_output *output_base,
|
|
|
|
struct weston_surface *es)
|
2012-02-24 08:03:14 +04:00
|
|
|
{
|
2012-08-10 01:19:23 +04:00
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output_base->compositor;
|
2012-07-14 09:06:28 +04:00
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
2012-08-03 19:50:05 +04:00
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (c->gbm == NULL)
|
|
|
|
return NULL;
|
2012-11-27 19:03:43 +04:00
|
|
|
if (output->base.transform != WL_OUTPUT_TRANSFORM_NORMAL)
|
|
|
|
return NULL;
|
2012-08-03 19:50:05 +04:00
|
|
|
if (output->cursor_surface)
|
|
|
|
return NULL;
|
|
|
|
if (es->output_mask != (1u << output_base->id))
|
|
|
|
return NULL;
|
2012-08-09 22:24:45 +04:00
|
|
|
if (c->cursors_are_broken)
|
2012-08-10 01:19:23 +04:00
|
|
|
return NULL;
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
if (es->buffer_ref.buffer == NULL ||
|
|
|
|
!wl_buffer_is_shm(es->buffer_ref.buffer) ||
|
2012-08-03 19:50:05 +04:00
|
|
|
es->geometry.width > 64 || es->geometry.height > 64)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
output->cursor_surface = es;
|
|
|
|
|
|
|
|
return &output->cursor_plane;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
drm_output_set_cursor(struct drm_output *output)
|
|
|
|
{
|
|
|
|
struct weston_surface *es = output->cursor_surface;
|
2012-07-14 09:06:28 +04:00
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output->base.compositor;
|
|
|
|
EGLint handle, stride;
|
|
|
|
struct gbm_bo *bo;
|
|
|
|
uint32_t buf[64 * 64];
|
|
|
|
unsigned char *s;
|
2012-07-18 20:08:37 +04:00
|
|
|
int i, x, y;
|
2012-07-14 09:06:28 +04:00
|
|
|
|
2012-08-03 23:45:23 +04:00
|
|
|
output->cursor_surface = NULL;
|
2012-08-03 19:50:05 +04:00
|
|
|
if (es == NULL) {
|
|
|
|
drmModeSetCursor(c->drm.fd, output->crtc_id, 0, 0, 0);
|
|
|
|
return;
|
|
|
|
}
|
2012-02-24 08:03:14 +04:00
|
|
|
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
if (es->buffer_ref.buffer &&
|
|
|
|
pixman_region32_not_empty(&output->cursor_plane.damage)) {
|
2012-08-03 19:50:05 +04:00
|
|
|
pixman_region32_fini(&output->cursor_plane.damage);
|
|
|
|
pixman_region32_init(&output->cursor_plane.damage);
|
2012-07-18 20:09:58 +04:00
|
|
|
output->current_cursor ^= 1;
|
|
|
|
bo = output->cursor_bo[output->current_cursor];
|
|
|
|
memset(buf, 0, sizeof buf);
|
compositor: introduce weston_buffer_reference
The wl_buffer reference counting API has been inconsistent. You would
manually increment the refcount and register a destroy listener, as
opposed to calling weston_buffer_post_release(), which internally
decremented the refcount, and then removing a list item.
Replace both cases with a single function:
weston_buffer_reference(weston_buffer_reference *ref, wl_buffer *buffer)
Buffer is assigned to ref->buffer, while taking care of all the refcounting
and release posting. You take a reference by passing a non-NULL buffer, and
release a reference by passing NULL as buffer. The function uses an
internal wl_buffer destroy listener, so the pointer gets reset on
destruction automatically.
This is inspired by the pipe_resource_reference() of Mesa, and modified
by krh's suggestion to add struct weston_buffer_reference.
Additionally, when a surface gets destroyed, the associated wl_buffer
will send a release event. Often the buffer is already destroyed on
client side, so the event will be discarded by libwayland-client.
Compositor-drm.c is converted to use weston_buffer_reference.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-12-04 17:58:12 +04:00
|
|
|
stride = wl_shm_buffer_get_stride(es->buffer_ref.buffer);
|
|
|
|
s = wl_shm_buffer_get_data(es->buffer_ref.buffer);
|
2012-07-18 20:09:58 +04:00
|
|
|
for (i = 0; i < es->geometry.height; i++)
|
|
|
|
memcpy(buf + i * 64, s + i * stride,
|
|
|
|
es->geometry.width * 4);
|
|
|
|
|
|
|
|
if (gbm_bo_write(bo, buf, sizeof buf) < 0)
|
2012-08-06 15:57:05 +04:00
|
|
|
weston_log("failed update cursor: %m\n");
|
2012-02-24 08:03:14 +04:00
|
|
|
|
2012-07-18 20:09:58 +04:00
|
|
|
handle = gbm_bo_get_handle(bo).s32;
|
|
|
|
if (drmModeSetCursor(c->drm.fd,
|
2012-08-09 22:24:45 +04:00
|
|
|
output->crtc_id, handle, 64, 64)) {
|
2012-08-06 15:57:05 +04:00
|
|
|
weston_log("failed to set cursor: %m\n");
|
2012-08-09 22:24:45 +04:00
|
|
|
c->cursors_are_broken = 1;
|
|
|
|
}
|
2012-07-14 09:06:28 +04:00
|
|
|
}
|
2012-02-24 08:03:14 +04:00
|
|
|
|
2012-07-18 20:08:37 +04:00
|
|
|
x = es->geometry.x - output->base.x;
|
|
|
|
y = es->geometry.y - output->base.y;
|
2012-08-03 19:30:18 +04:00
|
|
|
if (output->cursor_plane.x != x || output->cursor_plane.y != y) {
|
2012-08-09 22:24:45 +04:00
|
|
|
if (drmModeMoveCursor(c->drm.fd, output->crtc_id, x, y)) {
|
2012-07-18 20:08:37 +04:00
|
|
|
weston_log("failed to move cursor: %m\n");
|
2012-08-09 22:24:45 +04:00
|
|
|
c->cursors_are_broken = 1;
|
|
|
|
}
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
output->cursor_plane.x = x;
|
|
|
|
output->cursor_plane.y = y;
|
2012-07-14 09:06:28 +04:00
|
|
|
}
|
2012-02-24 08:03:14 +04:00
|
|
|
}
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
static void
|
|
|
|
drm_assign_planes(struct weston_output *output)
|
|
|
|
{
|
2012-07-14 09:06:28 +04:00
|
|
|
struct drm_compositor *c =
|
|
|
|
(struct drm_compositor *) output->compositor;
|
2012-05-03 19:39:35 +04:00
|
|
|
struct weston_surface *es, *next;
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_t overlap, surface_overlap;
|
2012-08-03 19:30:18 +04:00
|
|
|
struct weston_plane *primary, *next_plane;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Find a surface for each sprite in the output using some heuristics:
|
|
|
|
* 1) size
|
|
|
|
* 2) frequency of update
|
|
|
|
* 3) opacity (though some hw might support alpha blending)
|
|
|
|
* 4) clipping (this can be fixed with color keys)
|
|
|
|
*
|
|
|
|
* The idea is to save on blitting since this should save power.
|
|
|
|
* If we can get a large video surface on the sprite for example,
|
|
|
|
* the main display surface may not need to update at all, and
|
|
|
|
* the client buffer can be used directly for the sprite surface
|
|
|
|
* as we do for flipping full screen surfaces.
|
|
|
|
*/
|
|
|
|
pixman_region32_init(&overlap);
|
2012-08-03 19:30:18 +04:00
|
|
|
primary = &c->base.primary_plane;
|
2012-07-14 09:06:28 +04:00
|
|
|
wl_list_for_each_safe(es, next, &c->base.surface_list, link) {
|
2012-12-04 17:58:14 +04:00
|
|
|
/* test whether this buffer can ever go into a plane:
|
|
|
|
* non-shm, or small enough to be a cursor
|
|
|
|
*/
|
|
|
|
if ((es->buffer_ref.buffer &&
|
|
|
|
!wl_buffer_is_shm(es->buffer_ref.buffer)) ||
|
|
|
|
(es->geometry.width <= 64 && es->geometry.height <= 64))
|
|
|
|
es->keep_buffer = 1;
|
|
|
|
else
|
|
|
|
es->keep_buffer = 0;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_init(&surface_overlap);
|
|
|
|
pixman_region32_intersect(&surface_overlap, &overlap,
|
|
|
|
&es->transform.boundingbox);
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
next_plane = NULL;
|
2012-07-14 08:31:32 +04:00
|
|
|
if (pixman_region32_not_empty(&surface_overlap))
|
2012-08-03 19:30:18 +04:00
|
|
|
next_plane = primary;
|
|
|
|
if (next_plane == NULL)
|
2012-08-03 19:50:05 +04:00
|
|
|
next_plane = drm_output_prepare_cursor_surface(output, es);
|
2012-08-03 19:30:18 +04:00
|
|
|
if (next_plane == NULL)
|
|
|
|
next_plane = drm_output_prepare_scanout_surface(output, es);
|
|
|
|
if (next_plane == NULL)
|
|
|
|
next_plane = drm_output_prepare_overlay_surface(output, es);
|
|
|
|
if (next_plane == NULL)
|
|
|
|
next_plane = primary;
|
|
|
|
weston_surface_move_to_plane(es, next_plane);
|
|
|
|
if (next_plane == primary)
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_union(&overlap, &overlap,
|
|
|
|
&es->transform.boundingbox);
|
2012-07-14 08:31:32 +04:00
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
pixman_region32_fini(&surface_overlap);
|
|
|
|
}
|
|
|
|
pixman_region32_fini(&overlap);
|
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
static void
|
|
|
|
drm_output_fini_pixman(struct drm_output *output);
|
|
|
|
|
2011-08-30 00:52:23 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
drm_output_destroy(struct weston_output *output_base)
|
2011-08-30 00:52:23 +04:00
|
|
|
{
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
struct drm_compositor *c =
|
2011-08-30 13:38:26 +04:00
|
|
|
(struct drm_compositor *) output->base.compositor;
|
2011-08-30 00:52:23 +04:00
|
|
|
drmModeCrtcPtr origcrtc = output->original_crtc;
|
|
|
|
|
2012-02-29 21:53:50 +04:00
|
|
|
if (output->backlight)
|
|
|
|
backlight_destroy(output->backlight);
|
|
|
|
|
2011-08-30 00:52:23 +04:00
|
|
|
/* Turn off hardware cursor */
|
2012-07-14 09:06:28 +04:00
|
|
|
drmModeSetCursor(c->drm.fd, output->crtc_id, 0, 0, 0);
|
2011-08-30 00:52:23 +04:00
|
|
|
|
|
|
|
/* Restore original CRTC state */
|
|
|
|
drmModeSetCrtc(c->drm.fd, origcrtc->crtc_id, origcrtc->buffer_id,
|
2011-08-30 13:38:26 +04:00
|
|
|
origcrtc->x, origcrtc->y,
|
|
|
|
&output->connector_id, 1, &origcrtc->mode);
|
2011-08-30 00:52:23 +04:00
|
|
|
drmModeFreeCrtc(origcrtc);
|
|
|
|
|
2011-08-30 13:44:56 +04:00
|
|
|
c->crtc_allocator &= ~(1 << output->crtc_id);
|
|
|
|
c->connector_allocator &= ~(1 << output->connector_id);
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (c->use_pixman) {
|
|
|
|
drm_output_fini_pixman(output);
|
|
|
|
} else {
|
|
|
|
gl_renderer_output_destroy(output_base);
|
|
|
|
gbm_surface_destroy(output->surface);
|
|
|
|
}
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
weston_plane_release(&output->fb_plane);
|
|
|
|
weston_plane_release(&output->cursor_plane);
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_destroy(&output->base);
|
2011-08-30 13:44:56 +04:00
|
|
|
wl_list_remove(&output->base.link);
|
|
|
|
|
2012-07-27 07:03:57 +04:00
|
|
|
free(output->name);
|
2011-08-30 00:52:23 +04:00
|
|
|
free(output);
|
|
|
|
}
|
|
|
|
|
2012-04-17 13:20:48 +04:00
|
|
|
static struct drm_mode *
|
|
|
|
choose_mode (struct drm_output *output, struct weston_mode *target_mode)
|
|
|
|
{
|
|
|
|
struct drm_mode *tmp_mode = NULL, *mode;
|
|
|
|
|
|
|
|
if (output->base.current->width == target_mode->width &&
|
|
|
|
output->base.current->height == target_mode->height &&
|
|
|
|
(output->base.current->refresh == target_mode->refresh ||
|
|
|
|
target_mode->refresh == 0))
|
|
|
|
return (struct drm_mode *)output->base.current;
|
|
|
|
|
|
|
|
wl_list_for_each(mode, &output->base.mode_list, base.link) {
|
|
|
|
if (mode->mode_info.hdisplay == target_mode->width &&
|
|
|
|
mode->mode_info.vdisplay == target_mode->height) {
|
|
|
|
if (mode->mode_info.vrefresh == target_mode->refresh ||
|
|
|
|
target_mode->refresh == 0) {
|
|
|
|
return mode;
|
|
|
|
} else if (!tmp_mode)
|
|
|
|
tmp_mode = mode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return tmp_mode;
|
|
|
|
}
|
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
static int
|
|
|
|
drm_output_init_egl(struct drm_output *output, struct drm_compositor *ec);
|
2013-01-25 17:13:05 +04:00
|
|
|
static int
|
|
|
|
drm_output_init_pixman(struct drm_output *output, struct drm_compositor *c);
|
2012-12-14 19:37:30 +04:00
|
|
|
|
2012-04-17 13:20:48 +04:00
|
|
|
static int
|
|
|
|
drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mode)
|
|
|
|
{
|
|
|
|
struct drm_output *output;
|
|
|
|
struct drm_mode *drm_mode;
|
|
|
|
struct drm_compositor *ec;
|
|
|
|
|
|
|
|
if (output_base == NULL) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("output is NULL.\n");
|
2012-04-17 13:20:48 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mode == NULL) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("mode is NULL.\n");
|
2012-04-17 13:20:48 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ec = (struct drm_compositor *)output_base->compositor;
|
|
|
|
output = (struct drm_output *)output_base;
|
|
|
|
drm_mode = choose_mode (output, mode);
|
|
|
|
|
|
|
|
if (!drm_mode) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("%s, invalid resolution:%dx%d\n", __func__, mode->width, mode->height);
|
2012-04-17 13:20:48 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
if (&drm_mode->base == output->base.current)
|
|
|
|
return 0;
|
2012-04-17 13:20:48 +04:00
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
output->base.current->flags = 0;
|
2012-04-17 13:20:48 +04:00
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
output->base.current = &drm_mode->base;
|
|
|
|
output->base.current->flags =
|
|
|
|
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
|
2012-04-17 13:20:48 +04:00
|
|
|
|
|
|
|
/* reset rendering stuff. */
|
2013-01-25 17:13:03 +04:00
|
|
|
drm_output_release_fb(output, output->current);
|
|
|
|
drm_output_release_fb(output, output->next);
|
|
|
|
output->current = output->next = NULL;
|
2012-04-17 13:20:48 +04:00
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (ec->use_pixman) {
|
|
|
|
drm_output_fini_pixman(output);
|
|
|
|
if (drm_output_init_pixman(output, ec) < 0) {
|
|
|
|
weston_log("failed to init output pixman state with "
|
|
|
|
"new mode\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
gl_renderer_output_destroy(&output->base);
|
|
|
|
gbm_surface_destroy(output->surface);
|
2012-04-17 13:20:48 +04:00
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (drm_output_init_egl(output, ec) < 0) {
|
|
|
|
weston_log("failed to init output egl state with "
|
|
|
|
"new mode");
|
|
|
|
return -1;
|
|
|
|
}
|
2012-12-14 19:37:30 +04:00
|
|
|
}
|
2012-04-17 13:20:48 +04:00
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
return 0;
|
2012-04-17 13:20:48 +04:00
|
|
|
}
|
|
|
|
|
2011-04-22 20:27:57 +04:00
|
|
|
static int
|
2010-06-11 20:56:24 +04:00
|
|
|
on_drm_input(int fd, uint32_t mask, void *data)
|
|
|
|
{
|
|
|
|
drmEventContext evctx;
|
|
|
|
|
|
|
|
memset(&evctx, 0, sizeof evctx);
|
|
|
|
evctx.version = DRM_EVENT_CONTEXT_VERSION;
|
|
|
|
evctx.page_flip_handler = page_flip_handler;
|
2012-02-23 18:45:49 +04:00
|
|
|
evctx.vblank_handler = vblank_handler;
|
2010-06-11 20:56:24 +04:00
|
|
|
drmHandleEvent(fd, &evctx);
|
2011-04-22 20:27:57 +04:00
|
|
|
|
|
|
|
return 1;
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2013-01-25 17:13:02 +04:00
|
|
|
init_drm(struct drm_compositor *ec, struct udev_device *device)
|
2010-06-11 20:56:24 +04:00
|
|
|
{
|
2012-03-29 06:53:49 +04:00
|
|
|
const char *filename, *sysnum;
|
2010-08-09 22:43:33 +04:00
|
|
|
int fd;
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2012-05-10 20:28:35 +04:00
|
|
|
sysnum = udev_device_get_sysnum(device);
|
|
|
|
if (sysnum)
|
|
|
|
ec->drm.id = atoi(sysnum);
|
|
|
|
if (!sysnum || ec->drm.id < 0) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("cannot get device sysnum\n");
|
2012-05-10 20:28:35 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-08-09 22:43:33 +04:00
|
|
|
filename = udev_device_get_devnode(device);
|
2011-11-05 21:46:01 +04:00
|
|
|
fd = open(filename, O_RDWR | O_CLOEXEC);
|
2010-08-09 22:43:33 +04:00
|
|
|
if (fd < 0) {
|
2010-06-11 20:56:24 +04:00
|
|
|
/* Probably permissions error */
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("couldn't open %s, skipping\n",
|
2010-06-11 20:56:24 +04:00
|
|
|
udev_device_get_devnode(device));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-06-09 00:45:33 +04:00
|
|
|
weston_log("using %s\n", filename);
|
|
|
|
|
2011-03-02 13:14:59 +03:00
|
|
|
ec->drm.fd = fd;
|
2013-01-25 17:13:02 +04:00
|
|
|
|
2013-01-25 17:13:04 +04:00
|
|
|
|
2013-01-25 17:13:02 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
init_egl(struct drm_compositor *ec)
|
|
|
|
{
|
2011-04-30 11:32:11 +04:00
|
|
|
ec->gbm = gbm_create_device(ec->drm.fd);
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2013-03-02 15:27:39 +04:00
|
|
|
if (!ec->gbm)
|
|
|
|
return -1;
|
|
|
|
|
2012-11-13 22:10:29 +04:00
|
|
|
if (gl_renderer_create(&ec->base, ec->gbm, gl_renderer_opaque_attribs,
|
2012-11-13 22:10:19 +04:00
|
|
|
NULL) < 0) {
|
|
|
|
gbm_device_destroy(ec->gbm);
|
2012-03-12 02:27:41 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
static int
|
|
|
|
init_pixman(struct drm_compositor *ec)
|
|
|
|
{
|
|
|
|
return pixman_renderer_init(&ec->base);
|
|
|
|
}
|
|
|
|
|
2012-08-09 17:45:00 +04:00
|
|
|
static struct drm_mode *
|
2011-06-21 19:16:58 +04:00
|
|
|
drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
|
|
|
|
{
|
|
|
|
struct drm_mode *mode;
|
2012-05-10 20:23:53 +04:00
|
|
|
uint64_t refresh;
|
2011-06-21 19:16:58 +04:00
|
|
|
|
|
|
|
mode = malloc(sizeof *mode);
|
|
|
|
if (mode == NULL)
|
2012-08-09 17:45:00 +04:00
|
|
|
return NULL;
|
2011-06-21 19:16:58 +04:00
|
|
|
|
|
|
|
mode->base.flags = 0;
|
|
|
|
mode->base.width = info->hdisplay;
|
|
|
|
mode->base.height = info->vdisplay;
|
2012-05-10 20:23:53 +04:00
|
|
|
|
|
|
|
/* Calculate higher precision (mHz) refresh rate */
|
|
|
|
refresh = (info->clock * 1000000LL / info->htotal +
|
|
|
|
info->vtotal / 2) / info->vtotal;
|
|
|
|
|
|
|
|
if (info->flags & DRM_MODE_FLAG_INTERLACE)
|
|
|
|
refresh *= 2;
|
|
|
|
if (info->flags & DRM_MODE_FLAG_DBLSCAN)
|
|
|
|
refresh /= 2;
|
|
|
|
if (info->vscan > 1)
|
|
|
|
refresh /= info->vscan;
|
|
|
|
|
|
|
|
mode->base.refresh = refresh;
|
2011-06-21 19:16:58 +04:00
|
|
|
mode->mode_info = *info;
|
2012-06-28 19:28:15 +04:00
|
|
|
|
|
|
|
if (info->type & DRM_MODE_TYPE_PREFERRED)
|
|
|
|
mode->base.flags |= WL_OUTPUT_MODE_PREFERRED;
|
|
|
|
|
2011-06-21 19:16:58 +04:00
|
|
|
wl_list_insert(output->base.mode_list.prev, &mode->base.link);
|
|
|
|
|
2012-08-09 17:45:00 +04:00
|
|
|
return mode;
|
2011-06-21 19:16:58 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
drm_subpixel_to_wayland(int drm_value)
|
|
|
|
{
|
|
|
|
switch (drm_value) {
|
|
|
|
default:
|
|
|
|
case DRM_MODE_SUBPIXEL_UNKNOWN:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_UNKNOWN;
|
|
|
|
case DRM_MODE_SUBPIXEL_NONE:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_NONE;
|
|
|
|
case DRM_MODE_SUBPIXEL_HORIZONTAL_RGB:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB;
|
|
|
|
case DRM_MODE_SUBPIXEL_HORIZONTAL_BGR:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_HORIZONTAL_BGR;
|
|
|
|
case DRM_MODE_SUBPIXEL_VERTICAL_RGB:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_VERTICAL_RGB;
|
|
|
|
case DRM_MODE_SUBPIXEL_VERTICAL_BGR:
|
|
|
|
return WL_OUTPUT_SUBPIXEL_VERTICAL_BGR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-13 02:40:09 +04:00
|
|
|
/* returns a value between 0-255 range, where higher is brighter */
|
2012-02-29 21:53:50 +04:00
|
|
|
static uint32_t
|
|
|
|
drm_get_backlight(struct drm_output *output)
|
|
|
|
{
|
|
|
|
long brightness, max_brightness, norm;
|
|
|
|
|
|
|
|
brightness = backlight_get_brightness(output->backlight);
|
|
|
|
max_brightness = backlight_get_max_brightness(output->backlight);
|
|
|
|
|
2012-03-13 02:40:09 +04:00
|
|
|
/* convert it on a scale of 0 to 255 */
|
|
|
|
norm = (brightness * 255)/(max_brightness);
|
2012-02-29 21:53:50 +04:00
|
|
|
|
|
|
|
return (uint32_t) norm;
|
|
|
|
}
|
|
|
|
|
2012-03-13 02:40:09 +04:00
|
|
|
/* values accepted are between 0-255 range */
|
2012-02-29 21:53:50 +04:00
|
|
|
static void
|
|
|
|
drm_set_backlight(struct weston_output *output_base, uint32_t value)
|
|
|
|
{
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
long max_brightness, new_brightness;
|
|
|
|
|
|
|
|
if (!output->backlight)
|
|
|
|
return;
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
if (value > 255)
|
2012-02-29 21:53:50 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
max_brightness = backlight_get_max_brightness(output->backlight);
|
|
|
|
|
|
|
|
/* get denormalized value */
|
2012-03-13 02:40:09 +04:00
|
|
|
new_brightness = (value * max_brightness) / 255;
|
2012-02-29 21:53:50 +04:00
|
|
|
|
|
|
|
backlight_set_brightness(output->backlight, new_brightness);
|
|
|
|
}
|
|
|
|
|
|
|
|
static drmModePropertyPtr
|
|
|
|
drm_get_prop(int fd, drmModeConnectorPtr connector, const char *name)
|
|
|
|
{
|
|
|
|
drmModePropertyPtr props;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < connector->count_props; i++) {
|
|
|
|
props = drmModeGetProperty(fd, connector->props[i]);
|
|
|
|
if (!props)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!strcmp(props->name, name))
|
|
|
|
return props;
|
|
|
|
|
|
|
|
drmModeFreeProperty(props);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
drm_set_dpms(struct weston_output *output_base, enum dpms_enum level)
|
|
|
|
{
|
|
|
|
struct drm_output *output = (struct drm_output *) output_base;
|
|
|
|
struct weston_compositor *ec = output_base->compositor;
|
|
|
|
struct drm_compositor *c = (struct drm_compositor *) ec;
|
|
|
|
drmModeConnectorPtr connector;
|
|
|
|
drmModePropertyPtr prop;
|
|
|
|
|
|
|
|
connector = drmModeGetConnector(c->drm.fd, output->connector_id);
|
|
|
|
if (!connector)
|
|
|
|
return;
|
|
|
|
|
|
|
|
prop = drm_get_prop(c->drm.fd, connector, "DPMS");
|
|
|
|
if (!prop) {
|
|
|
|
drmModeFreeConnector(connector);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
drmModeConnectorSetProperty(c->drm.fd, connector->connector_id,
|
|
|
|
prop->prop_id, level);
|
|
|
|
drmModeFreeProperty(prop);
|
|
|
|
drmModeFreeConnector(connector);
|
|
|
|
}
|
|
|
|
|
2012-07-27 01:57:15 +04:00
|
|
|
static const char *connector_type_names[] = {
|
|
|
|
"None",
|
|
|
|
"VGA",
|
|
|
|
"DVI",
|
|
|
|
"DVI",
|
|
|
|
"DVI",
|
|
|
|
"Composite",
|
|
|
|
"TV",
|
|
|
|
"LVDS",
|
|
|
|
"CTV",
|
|
|
|
"DIN",
|
|
|
|
"DP",
|
|
|
|
"HDMI",
|
|
|
|
"HDMI",
|
|
|
|
"TV",
|
|
|
|
"eDP",
|
|
|
|
};
|
|
|
|
|
2012-07-27 06:44:55 +04:00
|
|
|
static int
|
|
|
|
find_crtc_for_connector(struct drm_compositor *ec,
|
|
|
|
drmModeRes *resources, drmModeConnector *connector)
|
|
|
|
{
|
|
|
|
drmModeEncoder *encoder;
|
|
|
|
uint32_t possible_crtcs;
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (j = 0; j < connector->count_encoders; j++) {
|
|
|
|
encoder = drmModeGetEncoder(ec->drm.fd, connector->encoders[j]);
|
|
|
|
if (encoder == NULL) {
|
|
|
|
weston_log("Failed to get encoder.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
possible_crtcs = encoder->possible_crtcs;
|
|
|
|
drmModeFreeEncoder(encoder);
|
|
|
|
|
|
|
|
for (i = 0; i < resources->count_crtcs; i++) {
|
|
|
|
if (possible_crtcs & (1 << i) &&
|
|
|
|
!(ec->crtc_allocator & (1 << resources->crtcs[i])))
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-12-14 19:37:29 +04:00
|
|
|
/* Init output state that depends on gl or gbm */
|
|
|
|
static int
|
|
|
|
drm_output_init_egl(struct drm_output *output, struct drm_compositor *ec)
|
|
|
|
{
|
2012-12-14 19:37:30 +04:00
|
|
|
int i, flags;
|
|
|
|
|
2012-12-14 19:37:29 +04:00
|
|
|
output->surface = gbm_surface_create(ec->gbm,
|
|
|
|
output->base.current->width,
|
|
|
|
output->base.current->height,
|
|
|
|
GBM_FORMAT_XRGB8888,
|
|
|
|
GBM_BO_USE_SCANOUT |
|
|
|
|
GBM_BO_USE_RENDERING);
|
|
|
|
if (!output->surface) {
|
|
|
|
weston_log("failed to create gbm surface\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gl_renderer_output_create(&output->base, output->surface) < 0) {
|
2012-12-14 19:37:30 +04:00
|
|
|
weston_log("failed to create gl renderer output state\n");
|
2012-12-14 19:37:29 +04:00
|
|
|
gbm_surface_destroy(output->surface);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-12-14 19:37:30 +04:00
|
|
|
flags = GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE;
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
if (output->cursor_bo[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
output->cursor_bo[i] =
|
|
|
|
gbm_bo_create(ec->gbm, 64, 64, GBM_FORMAT_ARGB8888,
|
|
|
|
flags);
|
|
|
|
}
|
|
|
|
|
2012-12-14 19:37:29 +04:00
|
|
|
if (output->cursor_bo[0] == NULL || output->cursor_bo[1] == NULL) {
|
|
|
|
weston_log("cursor buffers unavailable, using gl cursors\n");
|
|
|
|
ec->cursors_are_broken = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
static int
|
|
|
|
drm_output_init_pixman(struct drm_output *output, struct drm_compositor *c)
|
|
|
|
{
|
|
|
|
int w = output->base.current->width;
|
|
|
|
int h = output->base.current->height;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
/* FIXME error checking */
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_LENGTH(output->dumb); i++) {
|
|
|
|
output->dumb[i] = drm_fb_create_dumb(c, w, h);
|
|
|
|
if (!output->dumb[i])
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
output->image[i] =
|
|
|
|
pixman_image_create_bits(PIXMAN_x8r8g8b8, w, h,
|
|
|
|
output->dumb[i]->map,
|
|
|
|
output->dumb[i]->stride);
|
|
|
|
if (!output->image[i])
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pixman_renderer_output_create(&output->base) < 0)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
pixman_region32_init_rect(&output->previous_damage,
|
|
|
|
output->base.x, output->base.y, w, h);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
for (i = 0; i < ARRAY_LENGTH(output->dumb); i++) {
|
|
|
|
if (output->dumb[i])
|
|
|
|
drm_fb_destroy_dumb(output->dumb[i]);
|
|
|
|
if (output->image[i])
|
|
|
|
pixman_image_unref(output->image[i]);
|
|
|
|
|
|
|
|
output->dumb[i] = NULL;
|
|
|
|
output->image[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
drm_output_fini_pixman(struct drm_output *output)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
pixman_renderer_output_destroy(&output->base);
|
|
|
|
pixman_region32_fini(&output->previous_damage);
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_LENGTH(output->dumb); i++) {
|
|
|
|
drm_fb_destroy_dumb(output->dumb[i]);
|
|
|
|
pixman_image_unref(output->image[i]);
|
|
|
|
output->dumb[i] = NULL;
|
|
|
|
output->image[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-24 17:58:02 +04:00
|
|
|
static void
|
|
|
|
edid_parse_string(const uint8_t *data, char text[])
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int replaced = 0;
|
|
|
|
|
|
|
|
/* this is always 12 bytes, but we can't guarantee it's null
|
|
|
|
* terminated or not junk. */
|
|
|
|
strncpy(text, (const char *) data, 12);
|
|
|
|
|
|
|
|
/* remove insane chars */
|
|
|
|
for (i = 0; text[i] != '\0'; i++) {
|
|
|
|
if (text[i] == '\n' ||
|
|
|
|
text[i] == '\r') {
|
|
|
|
text[i] = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ensure string is printable */
|
|
|
|
for (i = 0; text[i] != '\0'; i++) {
|
|
|
|
if (!isprint(text[i])) {
|
|
|
|
text[i] = '-';
|
|
|
|
replaced++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if the string is random junk, ignore the string */
|
|
|
|
if (replaced > 4)
|
|
|
|
text[0] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
#define EDID_DESCRIPTOR_ALPHANUMERIC_DATA_STRING 0xfe
|
|
|
|
#define EDID_DESCRIPTOR_DISPLAY_PRODUCT_NAME 0xfc
|
|
|
|
#define EDID_DESCRIPTOR_DISPLAY_PRODUCT_SERIAL_NUMBER 0xff
|
|
|
|
#define EDID_OFFSET_DATA_BLOCKS 0x36
|
|
|
|
#define EDID_OFFSET_LAST_BLOCK 0x6c
|
|
|
|
#define EDID_OFFSET_PNPID 0x08
|
|
|
|
#define EDID_OFFSET_SERIAL 0x0c
|
|
|
|
|
|
|
|
static int
|
|
|
|
edid_parse(struct drm_edid *edid, const uint8_t *data, size_t length)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
uint32_t serial_number;
|
|
|
|
|
|
|
|
/* check header */
|
|
|
|
if (length < 128)
|
|
|
|
return -1;
|
|
|
|
if (data[0] != 0x00 || data[1] != 0xff)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* decode the PNP ID from three 5 bit words packed into 2 bytes
|
|
|
|
* /--08--\/--09--\
|
|
|
|
* 7654321076543210
|
|
|
|
* |\---/\---/\---/
|
|
|
|
* R C1 C2 C3 */
|
|
|
|
edid->pnp_id[0] = 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x7c) / 4) - 1;
|
|
|
|
edid->pnp_id[1] = 'A' + ((data[EDID_OFFSET_PNPID + 0] & 0x3) * 8) + ((data[EDID_OFFSET_PNPID + 1] & 0xe0) / 32) - 1;
|
|
|
|
edid->pnp_id[2] = 'A' + (data[EDID_OFFSET_PNPID + 1] & 0x1f) - 1;
|
|
|
|
edid->pnp_id[3] = '\0';
|
|
|
|
|
|
|
|
/* maybe there isn't a ASCII serial number descriptor, so use this instead */
|
|
|
|
serial_number = (uint32_t) data[EDID_OFFSET_SERIAL + 0];
|
|
|
|
serial_number += (uint32_t) data[EDID_OFFSET_SERIAL + 1] * 0x100;
|
|
|
|
serial_number += (uint32_t) data[EDID_OFFSET_SERIAL + 2] * 0x10000;
|
|
|
|
serial_number += (uint32_t) data[EDID_OFFSET_SERIAL + 3] * 0x1000000;
|
|
|
|
if (serial_number > 0)
|
|
|
|
sprintf(edid->serial_number, "%lu", (unsigned long) serial_number);
|
|
|
|
|
|
|
|
/* parse EDID data */
|
|
|
|
for (i = EDID_OFFSET_DATA_BLOCKS;
|
|
|
|
i <= EDID_OFFSET_LAST_BLOCK;
|
|
|
|
i += 18) {
|
|
|
|
/* ignore pixel clock data */
|
|
|
|
if (data[i] != 0)
|
|
|
|
continue;
|
|
|
|
if (data[i+2] != 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* any useful blocks? */
|
|
|
|
if (data[i+3] == EDID_DESCRIPTOR_DISPLAY_PRODUCT_NAME) {
|
|
|
|
edid_parse_string(&data[i+5],
|
|
|
|
edid->monitor_name);
|
|
|
|
} else if (data[i+3] == EDID_DESCRIPTOR_DISPLAY_PRODUCT_SERIAL_NUMBER) {
|
|
|
|
edid_parse_string(&data[i+5],
|
|
|
|
edid->serial_number);
|
|
|
|
} else if (data[i+3] == EDID_DESCRIPTOR_ALPHANUMERIC_DATA_STRING) {
|
|
|
|
edid_parse_string(&data[i+5],
|
|
|
|
edid->eisa_id);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
find_and_parse_output_edid(struct drm_compositor *ec,
|
|
|
|
struct drm_output *output,
|
|
|
|
drmModeConnector *connector)
|
|
|
|
{
|
|
|
|
drmModePropertyBlobPtr edid_blob = NULL;
|
|
|
|
drmModePropertyPtr property;
|
|
|
|
int i;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
for (i = 0; i < connector->count_props && !edid_blob; i++) {
|
|
|
|
property = drmModeGetProperty(ec->drm.fd, connector->props[i]);
|
|
|
|
if (!property)
|
|
|
|
continue;
|
|
|
|
if ((property->flags & DRM_MODE_PROP_BLOB) &&
|
|
|
|
!strcmp(property->name, "EDID")) {
|
|
|
|
edid_blob = drmModeGetPropertyBlob(ec->drm.fd,
|
|
|
|
connector->prop_values[i]);
|
|
|
|
}
|
|
|
|
drmModeFreeProperty(property);
|
|
|
|
}
|
|
|
|
if (!edid_blob)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rc = edid_parse(&output->edid,
|
|
|
|
edid_blob->data,
|
|
|
|
edid_blob->length);
|
|
|
|
if (!rc) {
|
|
|
|
weston_log("EDID data '%s', '%s', '%s'\n",
|
|
|
|
output->edid.pnp_id,
|
|
|
|
output->edid.monitor_name,
|
|
|
|
output->edid.serial_number);
|
|
|
|
if (output->edid.pnp_id[0] != '\0')
|
|
|
|
output->base.make = output->edid.pnp_id;
|
|
|
|
if (output->edid.monitor_name[0] != '\0')
|
|
|
|
output->base.model = output->edid.monitor_name;
|
|
|
|
if (output->edid.serial_number[0] != '\0')
|
|
|
|
output->base.serial_number = output->edid.serial_number;
|
|
|
|
}
|
|
|
|
drmModeFreePropertyBlob(edid_blob);
|
|
|
|
}
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
static int
|
2010-06-14 19:54:00 +04:00
|
|
|
create_output_for_connector(struct drm_compositor *ec,
|
2010-06-11 20:56:24 +04:00
|
|
|
drmModeRes *resources,
|
2011-03-11 18:39:20 +03:00
|
|
|
drmModeConnector *connector,
|
2012-02-29 21:53:50 +04:00
|
|
|
int x, int y, struct udev_device *drm_device)
|
2010-06-11 20:56:24 +04:00
|
|
|
{
|
2010-06-14 19:54:00 +04:00
|
|
|
struct drm_output *output;
|
2012-08-09 17:45:00 +04:00
|
|
|
struct drm_mode *drm_mode, *next, *preferred, *current, *configured;
|
|
|
|
struct weston_mode *m;
|
2012-07-31 05:51:08 +04:00
|
|
|
struct drm_configured_output *o = NULL, *temp;
|
2010-06-11 20:56:24 +04:00
|
|
|
drmModeEncoder *encoder;
|
2012-06-28 19:28:15 +04:00
|
|
|
drmModeModeInfo crtc_mode;
|
|
|
|
drmModeCrtc *crtc;
|
2012-08-09 17:45:00 +04:00
|
|
|
int i;
|
2012-07-27 01:57:15 +04:00
|
|
|
char name[32];
|
|
|
|
const char *type_name;
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2012-07-27 06:44:55 +04:00
|
|
|
i = find_crtc_for_connector(ec, resources, connector);
|
|
|
|
if (i < 0) {
|
|
|
|
weston_log("No usable crtc/encoder pair for connector.\n");
|
2010-06-11 20:56:24 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-06-21 19:16:58 +04:00
|
|
|
output = malloc(sizeof *output);
|
2012-07-27 06:44:55 +04:00
|
|
|
if (output == NULL)
|
2011-06-21 19:16:58 +04:00
|
|
|
return -1;
|
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
memset(output, 0, sizeof *output);
|
2011-06-21 19:16:58 +04:00
|
|
|
output->base.subpixel = drm_subpixel_to_wayland(connector->subpixel);
|
|
|
|
output->base.make = "unknown";
|
|
|
|
output->base.model = "unknown";
|
2013-04-24 17:58:02 +04:00
|
|
|
output->base.serial_number = "unknown";
|
2011-06-21 19:16:58 +04:00
|
|
|
wl_list_init(&output->base.mode_list);
|
2010-06-14 19:54:00 +04:00
|
|
|
|
2012-07-27 01:57:15 +04:00
|
|
|
if (connector->connector_type < ARRAY_LENGTH(connector_type_names))
|
|
|
|
type_name = connector_type_names[connector->connector_type];
|
|
|
|
else
|
|
|
|
type_name = "UNKNOWN";
|
|
|
|
snprintf(name, 32, "%s%d", type_name, connector->connector_type_id);
|
|
|
|
output->name = strdup(name);
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
output->crtc_id = resources->crtcs[i];
|
2012-08-09 05:27:37 +04:00
|
|
|
output->pipe = i;
|
2011-03-15 17:08:41 +03:00
|
|
|
ec->crtc_allocator |= (1 << output->crtc_id);
|
2010-06-11 20:56:24 +04:00
|
|
|
output->connector_id = connector->connector_id;
|
2011-03-15 17:08:41 +03:00
|
|
|
ec->connector_allocator |= (1 << output->connector_id);
|
2011-06-21 19:16:58 +04:00
|
|
|
|
2011-08-30 00:52:23 +04:00
|
|
|
output->original_crtc = drmModeGetCrtc(ec->drm.fd, output->crtc_id);
|
2011-12-08 20:05:45 +04:00
|
|
|
|
2012-06-28 19:28:15 +04:00
|
|
|
/* Get the current mode on the crtc that's currently driving
|
|
|
|
* this connector. */
|
|
|
|
encoder = drmModeGetEncoder(ec->drm.fd, connector->encoder_id);
|
2012-07-31 02:09:46 +04:00
|
|
|
memset(&crtc_mode, 0, sizeof crtc_mode);
|
|
|
|
if (encoder != NULL) {
|
|
|
|
crtc = drmModeGetCrtc(ec->drm.fd, encoder->crtc_id);
|
|
|
|
drmModeFreeEncoder(encoder);
|
|
|
|
if (crtc == NULL)
|
|
|
|
goto err_free;
|
|
|
|
if (crtc->mode_valid)
|
|
|
|
crtc_mode = crtc->mode;
|
|
|
|
drmModeFreeCrtc(crtc);
|
|
|
|
}
|
2012-06-28 19:28:15 +04:00
|
|
|
|
2011-12-08 20:05:45 +04:00
|
|
|
for (i = 0; i < connector->count_modes; i++) {
|
2012-08-09 17:45:00 +04:00
|
|
|
drm_mode = drm_output_add_mode(output, &connector->modes[i]);
|
|
|
|
if (!drm_mode)
|
2011-12-08 20:05:45 +04:00
|
|
|
goto err_free;
|
|
|
|
}
|
2011-08-30 00:52:23 +04:00
|
|
|
|
2012-06-28 19:28:15 +04:00
|
|
|
preferred = NULL;
|
|
|
|
current = NULL;
|
2012-07-31 05:51:08 +04:00
|
|
|
configured = NULL;
|
|
|
|
|
|
|
|
wl_list_for_each(temp, &configured_output_list, link) {
|
|
|
|
if (strcmp(temp->name, output->name) == 0) {
|
2012-08-18 11:04:05 +04:00
|
|
|
if (temp->mode)
|
|
|
|
weston_log("%s mode \"%s\" in config\n",
|
2012-07-31 05:51:08 +04:00
|
|
|
temp->name, temp->mode);
|
|
|
|
o = temp;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-09 17:45:01 +04:00
|
|
|
if (o && o->config == OUTPUT_CONFIG_OFF) {
|
2012-07-31 05:51:08 +04:00
|
|
|
weston_log("Disabling output %s\n", o->name);
|
|
|
|
|
|
|
|
drmModeSetCrtc(ec->drm.fd, output->crtc_id,
|
|
|
|
0, 0, 0, 0, 0, NULL);
|
|
|
|
goto err_free;
|
|
|
|
}
|
|
|
|
|
2012-06-28 19:28:15 +04:00
|
|
|
wl_list_for_each(drm_mode, &output->base.mode_list, base.link) {
|
2012-08-18 11:04:05 +04:00
|
|
|
if (o && o->config == OUTPUT_CONFIG_MODE &&
|
|
|
|
o->width == drm_mode->base.width &&
|
|
|
|
o->height == drm_mode->base.height)
|
2012-08-09 17:45:00 +04:00
|
|
|
configured = drm_mode;
|
2012-07-31 02:09:46 +04:00
|
|
|
if (!memcmp(&crtc_mode, &drm_mode->mode_info, sizeof crtc_mode))
|
2012-08-09 17:45:00 +04:00
|
|
|
current = drm_mode;
|
2012-06-28 19:28:15 +04:00
|
|
|
if (drm_mode->base.flags & WL_OUTPUT_MODE_PREFERRED)
|
2012-08-09 17:45:00 +04:00
|
|
|
preferred = drm_mode;
|
2012-06-28 19:28:15 +04:00
|
|
|
}
|
|
|
|
|
2012-08-01 01:30:41 +04:00
|
|
|
if (o && o->config == OUTPUT_CONFIG_MODELINE) {
|
2012-08-09 17:45:00 +04:00
|
|
|
configured = drm_output_add_mode(output, &o->crtc_mode);
|
|
|
|
if (!configured)
|
2012-08-01 01:30:41 +04:00
|
|
|
goto err_free;
|
|
|
|
current = configured;
|
|
|
|
}
|
|
|
|
|
2012-07-31 02:09:46 +04:00
|
|
|
if (current == NULL && crtc_mode.clock != 0) {
|
2012-08-09 17:45:00 +04:00
|
|
|
current = drm_output_add_mode(output, &crtc_mode);
|
|
|
|
if (!current)
|
2011-12-08 20:05:45 +04:00
|
|
|
goto err_free;
|
|
|
|
}
|
2011-06-21 19:16:58 +04:00
|
|
|
|
2012-07-31 05:51:08 +04:00
|
|
|
if (o && o->config == OUTPUT_CONFIG_CURRENT)
|
|
|
|
configured = current;
|
|
|
|
|
2012-07-31 02:09:46 +04:00
|
|
|
if (option_current_mode && current)
|
2012-08-09 17:45:00 +04:00
|
|
|
output->base.current = ¤t->base;
|
2012-07-31 05:51:08 +04:00
|
|
|
else if (configured)
|
2012-08-09 17:45:00 +04:00
|
|
|
output->base.current = &configured->base;
|
2012-07-31 02:09:46 +04:00
|
|
|
else if (preferred)
|
2012-08-09 17:45:00 +04:00
|
|
|
output->base.current = &preferred->base;
|
2012-07-31 02:09:46 +04:00
|
|
|
else if (current)
|
2012-08-09 17:45:00 +04:00
|
|
|
output->base.current = ¤t->base;
|
2012-07-31 02:09:46 +04:00
|
|
|
|
|
|
|
if (output->base.current == NULL) {
|
|
|
|
weston_log("no available modes for %s\n", output->name);
|
|
|
|
goto err_free;
|
2012-06-28 19:28:15 +04:00
|
|
|
}
|
2011-06-21 19:16:58 +04:00
|
|
|
|
2012-07-31 02:09:46 +04:00
|
|
|
output->base.current->flags |= WL_OUTPUT_MODE_CURRENT;
|
|
|
|
|
2012-11-13 22:10:18 +04:00
|
|
|
weston_output_init(&output->base, &ec->base, x, y,
|
|
|
|
connector->mmWidth, connector->mmHeight,
|
|
|
|
o ? o->transform : WL_OUTPUT_TRANSFORM_NORMAL);
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (ec->use_pixman) {
|
|
|
|
if (drm_output_init_pixman(output, ec) < 0) {
|
|
|
|
weston_log("Failed to init output pixman state\n");
|
|
|
|
goto err_output;
|
|
|
|
}
|
|
|
|
} else if (drm_output_init_egl(output, ec) < 0) {
|
2012-12-14 19:37:29 +04:00
|
|
|
weston_log("Failed to init output gl state\n");
|
2012-11-13 22:10:18 +04:00
|
|
|
goto err_output;
|
2012-10-21 21:29:26 +04:00
|
|
|
}
|
2012-05-03 19:39:35 +04:00
|
|
|
|
2012-02-29 21:53:50 +04:00
|
|
|
output->backlight = backlight_init(drm_device,
|
|
|
|
connector->connector_type);
|
|
|
|
if (output->backlight) {
|
|
|
|
output->base.set_backlight = drm_set_backlight;
|
|
|
|
output->base.backlight_current = drm_get_backlight(output);
|
|
|
|
}
|
|
|
|
|
2011-10-24 21:26:32 +04:00
|
|
|
wl_list_insert(ec->base.output_list.prev, &output->base.link);
|
|
|
|
|
2013-04-24 17:58:02 +04:00
|
|
|
find_and_parse_output_edid(ec, output, connector);
|
|
|
|
|
2012-04-17 13:20:49 +04:00
|
|
|
output->base.origin = output->base.current;
|
2013-04-06 01:07:11 +04:00
|
|
|
output->base.start_repaint_loop = drm_output_start_repaint_loop;
|
2012-01-26 08:32:28 +04:00
|
|
|
output->base.repaint = drm_output_repaint;
|
2011-08-30 00:52:23 +04:00
|
|
|
output->base.destroy = drm_output_destroy;
|
2012-02-23 18:45:49 +04:00
|
|
|
output->base.assign_planes = drm_assign_planes;
|
2012-02-29 21:53:50 +04:00
|
|
|
output->base.set_dpms = drm_set_dpms;
|
2012-04-17 13:20:48 +04:00
|
|
|
output->base.switch_mode = drm_output_switch_mode;
|
2011-03-11 18:39:20 +03:00
|
|
|
|
2013-05-02 00:52:12 +04:00
|
|
|
output->base.gamma_size = output->original_crtc->gamma_size;
|
|
|
|
output->base.set_gamma = drm_output_set_gamma;
|
|
|
|
|
2012-08-03 19:30:18 +04:00
|
|
|
weston_plane_init(&output->cursor_plane, 0, 0);
|
|
|
|
weston_plane_init(&output->fb_plane, 0, 0);
|
|
|
|
|
2013-03-05 19:30:27 +04:00
|
|
|
weston_compositor_stack_plane(&ec->base, &output->cursor_plane, NULL);
|
|
|
|
weston_compositor_stack_plane(&ec->base, &output->fb_plane,
|
|
|
|
&ec->base.primary_plane);
|
|
|
|
|
2012-07-27 01:57:15 +04:00
|
|
|
weston_log("Output %s, (connector %d, crtc %d)\n",
|
|
|
|
output->name, output->connector_id, output->crtc_id);
|
2012-06-28 19:28:15 +04:00
|
|
|
wl_list_for_each(m, &output->base.mode_list, link)
|
|
|
|
weston_log_continue(" mode %dx%d@%.1f%s%s%s\n",
|
|
|
|
m->width, m->height, m->refresh / 1000.0,
|
|
|
|
m->flags & WL_OUTPUT_MODE_PREFERRED ?
|
|
|
|
", preferred" : "",
|
|
|
|
m->flags & WL_OUTPUT_MODE_CURRENT ?
|
|
|
|
", current" : "",
|
|
|
|
connector->count_modes == 0 ?
|
|
|
|
", built-in" : "");
|
2012-06-09 00:45:33 +04:00
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
return 0;
|
2011-12-08 20:05:45 +04:00
|
|
|
|
2012-11-13 22:10:18 +04:00
|
|
|
err_output:
|
|
|
|
weston_output_destroy(&output->base);
|
2011-12-08 20:05:45 +04:00
|
|
|
err_free:
|
|
|
|
wl_list_for_each_safe(drm_mode, next, &output->base.mode_list,
|
|
|
|
base.link) {
|
|
|
|
wl_list_remove(&drm_mode->base.link);
|
|
|
|
free(drm_mode);
|
|
|
|
}
|
|
|
|
|
|
|
|
drmModeFreeCrtc(output->original_crtc);
|
|
|
|
ec->crtc_allocator &= ~(1 << output->crtc_id);
|
|
|
|
ec->connector_allocator &= ~(1 << output->connector_id);
|
2012-07-27 07:03:57 +04:00
|
|
|
free(output->name);
|
2011-12-08 20:05:45 +04:00
|
|
|
free(output);
|
2012-03-12 02:27:41 +04:00
|
|
|
|
2011-12-08 20:05:45 +04:00
|
|
|
return -1;
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
static void
|
|
|
|
create_sprites(struct drm_compositor *ec)
|
|
|
|
{
|
|
|
|
struct drm_sprite *sprite;
|
|
|
|
drmModePlaneRes *plane_res;
|
|
|
|
drmModePlane *plane;
|
2012-03-30 19:52:39 +04:00
|
|
|
uint32_t i;
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
plane_res = drmModeGetPlaneResources(ec->drm.fd);
|
|
|
|
if (!plane_res) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to get plane resources: %s\n",
|
2012-02-23 18:45:49 +04:00
|
|
|
strerror(errno));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < plane_res->count_planes; i++) {
|
|
|
|
plane = drmModeGetPlane(ec->drm.fd, plane_res->planes[i]);
|
|
|
|
if (!plane)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
sprite = malloc(sizeof(*sprite) + ((sizeof(uint32_t)) *
|
|
|
|
plane->count_formats));
|
|
|
|
if (!sprite) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("%s: out of memory\n",
|
2012-02-23 18:45:49 +04:00
|
|
|
__func__);
|
|
|
|
free(plane);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(sprite, 0, sizeof *sprite);
|
|
|
|
|
|
|
|
sprite->possible_crtcs = plane->possible_crtcs;
|
|
|
|
sprite->plane_id = plane->plane_id;
|
2012-11-09 16:19:05 +04:00
|
|
|
sprite->current = NULL;
|
|
|
|
sprite->next = NULL;
|
2012-02-23 18:45:49 +04:00
|
|
|
sprite->compositor = ec;
|
|
|
|
sprite->count_formats = plane->count_formats;
|
|
|
|
memcpy(sprite->formats, plane->formats,
|
2012-03-12 04:48:44 +04:00
|
|
|
plane->count_formats * sizeof(plane->formats[0]));
|
2012-02-23 18:45:49 +04:00
|
|
|
drmModeFreePlane(plane);
|
2012-08-03 19:30:18 +04:00
|
|
|
weston_plane_init(&sprite->plane, 0, 0);
|
2013-03-05 19:30:27 +04:00
|
|
|
weston_compositor_stack_plane(&ec->base, &sprite->plane,
|
|
|
|
&ec->base.primary_plane);
|
2012-02-23 18:45:49 +04:00
|
|
|
|
|
|
|
wl_list_insert(&ec->sprite_list, &sprite->link);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(plane_res->planes);
|
|
|
|
free(plane_res);
|
|
|
|
}
|
|
|
|
|
2012-02-24 06:45:32 +04:00
|
|
|
static void
|
|
|
|
destroy_sprites(struct drm_compositor *compositor)
|
|
|
|
{
|
|
|
|
struct drm_sprite *sprite, *next;
|
|
|
|
struct drm_output *output;
|
|
|
|
|
|
|
|
output = container_of(compositor->base.output_list.next,
|
|
|
|
struct drm_output, base.link);
|
|
|
|
|
|
|
|
wl_list_for_each_safe(sprite, next, &compositor->sprite_list, link) {
|
|
|
|
drmModeSetPlane(compositor->drm.fd,
|
|
|
|
sprite->plane_id,
|
|
|
|
output->crtc_id, 0, 0,
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0);
|
2013-01-25 17:13:03 +04:00
|
|
|
drm_output_release_fb(output, sprite->current);
|
|
|
|
drm_output_release_fb(output, sprite->next);
|
2012-08-03 19:30:18 +04:00
|
|
|
weston_plane_release(&sprite->plane);
|
2012-02-24 06:45:32 +04:00
|
|
|
free(sprite);
|
|
|
|
}
|
|
|
|
}
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
static int
|
2012-03-30 19:52:39 +04:00
|
|
|
create_outputs(struct drm_compositor *ec, uint32_t option_connector,
|
2012-02-29 21:53:50 +04:00
|
|
|
struct udev_device *drm_device)
|
2010-06-11 20:56:24 +04:00
|
|
|
{
|
|
|
|
drmModeConnector *connector;
|
|
|
|
drmModeRes *resources;
|
|
|
|
int i;
|
2011-03-11 18:39:20 +03:00
|
|
|
int x = 0, y = 0;
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2011-03-02 13:14:59 +03:00
|
|
|
resources = drmModeGetResources(ec->drm.fd);
|
2010-06-11 20:56:24 +04:00
|
|
|
if (!resources) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("drmModeGetResources failed\n");
|
2010-06-11 20:56:24 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
ec->crtcs = calloc(resources->count_crtcs, sizeof(uint32_t));
|
2012-03-07 23:55:21 +04:00
|
|
|
if (!ec->crtcs) {
|
|
|
|
drmModeFreeResources(resources);
|
2012-02-23 18:45:49 +04:00
|
|
|
return -1;
|
2012-03-07 23:55:21 +04:00
|
|
|
}
|
2012-02-23 18:45:49 +04:00
|
|
|
|
2012-08-09 23:18:28 +04:00
|
|
|
ec->min_width = resources->min_width;
|
|
|
|
ec->max_width = resources->max_width;
|
|
|
|
ec->min_height = resources->min_height;
|
|
|
|
ec->max_height = resources->max_height;
|
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
ec->num_crtcs = resources->count_crtcs;
|
|
|
|
memcpy(ec->crtcs, resources->crtcs, sizeof(uint32_t) * ec->num_crtcs);
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
for (i = 0; i < resources->count_connectors; i++) {
|
2011-08-30 13:38:26 +04:00
|
|
|
connector = drmModeGetConnector(ec->drm.fd,
|
|
|
|
resources->connectors[i]);
|
2010-06-11 20:56:24 +04:00
|
|
|
if (connector == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (connector->connection == DRM_MODE_CONNECTED &&
|
|
|
|
(option_connector == 0 ||
|
2011-08-02 15:03:54 +04:00
|
|
|
connector->connector_id == option_connector)) {
|
2011-03-11 18:39:20 +03:00
|
|
|
if (create_output_for_connector(ec, resources,
|
2012-02-29 21:53:50 +04:00
|
|
|
connector, x, y,
|
|
|
|
drm_device) < 0) {
|
2011-10-07 10:20:53 +04:00
|
|
|
drmModeFreeConnector(connector);
|
|
|
|
continue;
|
|
|
|
}
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2011-08-02 15:03:54 +04:00
|
|
|
x += container_of(ec->base.output_list.prev,
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output,
|
2012-08-18 11:04:05 +04:00
|
|
|
link)->width;
|
2011-08-02 15:03:54 +04:00
|
|
|
}
|
2011-03-11 18:39:20 +03:00
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
drmModeFreeConnector(connector);
|
|
|
|
}
|
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
if (wl_list_empty(&ec->base.output_list)) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("No currently active connector found.\n");
|
2012-03-07 23:55:21 +04:00
|
|
|
drmModeFreeResources(resources);
|
2010-06-11 20:56:24 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
drmModeFreeResources(resources);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-03-15 17:08:41 +03:00
|
|
|
static void
|
2012-02-29 21:53:50 +04:00
|
|
|
update_outputs(struct drm_compositor *ec, struct udev_device *drm_device)
|
2011-03-15 17:08:41 +03:00
|
|
|
{
|
|
|
|
drmModeConnector *connector;
|
|
|
|
drmModeRes *resources;
|
|
|
|
struct drm_output *output, *next;
|
|
|
|
int x = 0, y = 0;
|
|
|
|
int x_offset = 0, y_offset = 0;
|
|
|
|
uint32_t connected = 0, disconnects = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
resources = drmModeGetResources(ec->drm.fd);
|
|
|
|
if (!resources) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("drmModeGetResources failed\n");
|
2011-03-15 17:08:41 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* collect new connects */
|
|
|
|
for (i = 0; i < resources->count_connectors; i++) {
|
2011-08-30 13:38:26 +04:00
|
|
|
int connector_id = resources->connectors[i];
|
|
|
|
|
|
|
|
connector = drmModeGetConnector(ec->drm.fd, connector_id);
|
2011-12-08 20:05:43 +04:00
|
|
|
if (connector == NULL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (connector->connection != DRM_MODE_CONNECTED) {
|
|
|
|
drmModeFreeConnector(connector);
|
2011-03-15 17:08:41 +03:00
|
|
|
continue;
|
2011-12-08 20:05:43 +04:00
|
|
|
}
|
2011-03-15 17:08:41 +03:00
|
|
|
|
2011-08-30 13:38:26 +04:00
|
|
|
connected |= (1 << connector_id);
|
|
|
|
|
|
|
|
if (!(ec->connector_allocator & (1 << connector_id))) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *last =
|
2011-03-15 17:08:41 +03:00
|
|
|
container_of(ec->base.output_list.prev,
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output, link);
|
2011-03-15 17:08:41 +03:00
|
|
|
|
|
|
|
/* XXX: not yet needed, we die with 0 outputs */
|
|
|
|
if (!wl_list_empty(&ec->base.output_list))
|
2012-08-18 11:04:05 +04:00
|
|
|
x = last->x + last->width;
|
2011-03-15 17:08:41 +03:00
|
|
|
else
|
|
|
|
x = 0;
|
|
|
|
y = 0;
|
|
|
|
create_output_for_connector(ec, resources,
|
2012-02-29 21:53:50 +04:00
|
|
|
connector, x, y,
|
|
|
|
drm_device);
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("connector %d connected\n", connector_id);
|
2011-08-30 13:38:26 +04:00
|
|
|
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
drmModeFreeConnector(connector);
|
|
|
|
}
|
|
|
|
drmModeFreeResources(resources);
|
|
|
|
|
|
|
|
disconnects = ec->connector_allocator & ~connected;
|
|
|
|
if (disconnects) {
|
|
|
|
wl_list_for_each_safe(output, next, &ec->base.output_list,
|
|
|
|
base.link) {
|
|
|
|
if (x_offset != 0 || y_offset != 0) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_move(&output->base,
|
2011-03-15 17:08:41 +03:00
|
|
|
output->base.x - x_offset,
|
|
|
|
output->base.y - y_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (disconnects & (1 << output->connector_id)) {
|
|
|
|
disconnects &= ~(1 << output->connector_id);
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("connector %d disconnected\n",
|
2011-03-15 17:08:41 +03:00
|
|
|
output->connector_id);
|
2012-08-18 11:04:05 +04:00
|
|
|
x_offset += output->base.width;
|
2011-08-30 13:44:56 +04:00
|
|
|
drm_output_destroy(&output->base);
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: handle zero outputs, without terminating */
|
|
|
|
if (ec->connector_allocator == 0)
|
|
|
|
wl_display_terminate(ec->base.wl_display);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-03-11 23:05:21 +04:00
|
|
|
udev_event_is_hotplug(struct drm_compositor *ec, struct udev_device *device)
|
2011-03-15 17:08:41 +03:00
|
|
|
{
|
2012-03-11 23:05:21 +04:00
|
|
|
const char *sysnum;
|
2012-03-11 23:05:22 +04:00
|
|
|
const char *val;
|
2012-03-11 23:05:21 +04:00
|
|
|
|
|
|
|
sysnum = udev_device_get_sysnum(device);
|
|
|
|
if (!sysnum || atoi(sysnum) != ec->drm.id)
|
|
|
|
return 0;
|
2011-08-30 13:38:26 +04:00
|
|
|
|
2012-03-11 23:05:22 +04:00
|
|
|
val = udev_device_get_property_value(device, "HOTPLUG");
|
|
|
|
if (!val)
|
2011-03-15 17:08:41 +03:00
|
|
|
return 0;
|
|
|
|
|
2012-03-11 23:05:22 +04:00
|
|
|
return strcmp(val, "1") == 0;
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
|
2011-04-22 20:27:57 +04:00
|
|
|
static int
|
2011-03-15 17:08:41 +03:00
|
|
|
udev_drm_event(int fd, uint32_t mask, void *data)
|
|
|
|
{
|
|
|
|
struct drm_compositor *ec = data;
|
|
|
|
struct udev_device *event;
|
|
|
|
|
|
|
|
event = udev_monitor_receive_device(ec->udev_monitor);
|
2011-08-30 13:38:26 +04:00
|
|
|
|
2012-03-11 23:05:21 +04:00
|
|
|
if (udev_event_is_hotplug(ec, event))
|
2012-02-29 21:53:50 +04:00
|
|
|
update_outputs(ec, event);
|
2011-03-15 17:08:41 +03:00
|
|
|
|
|
|
|
udev_device_unref(event);
|
2011-04-22 20:27:57 +04:00
|
|
|
|
|
|
|
return 1;
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
|
2012-07-31 22:32:01 +04:00
|
|
|
static void
|
|
|
|
drm_restore(struct weston_compositor *ec)
|
|
|
|
{
|
|
|
|
struct drm_compositor *d = (struct drm_compositor *) ec;
|
|
|
|
|
|
|
|
if (weston_launcher_drm_set_master(&d->base, d->drm.fd, 0) < 0)
|
|
|
|
weston_log("failed to drop master: %m\n");
|
|
|
|
tty_reset(d->tty);
|
|
|
|
}
|
|
|
|
|
2012-08-01 08:29:56 +04:00
|
|
|
static void
|
|
|
|
drm_free_configured_output(struct drm_configured_output *output)
|
|
|
|
{
|
|
|
|
free(output->name);
|
|
|
|
free(output->mode);
|
|
|
|
free(output);
|
|
|
|
}
|
|
|
|
|
2010-12-02 00:52:15 +03:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
drm_destroy(struct weston_compositor *ec)
|
2010-12-02 00:52:15 +03:00
|
|
|
{
|
|
|
|
struct drm_compositor *d = (struct drm_compositor *) ec;
|
2013-02-19 00:43:29 +04:00
|
|
|
struct udev_seat *seat, *next;
|
2012-07-31 05:51:08 +04:00
|
|
|
struct drm_configured_output *o, *n;
|
2010-12-02 00:52:15 +03:00
|
|
|
|
2013-02-19 00:43:29 +04:00
|
|
|
wl_list_for_each_safe(seat, next, &ec->seat_list, base.link)
|
|
|
|
udev_seat_destroy(seat);
|
2012-07-31 05:51:08 +04:00
|
|
|
wl_list_for_each_safe(o, n, &configured_output_list, link)
|
2012-08-01 08:29:56 +04:00
|
|
|
drm_free_configured_output(o);
|
2012-03-29 00:36:09 +04:00
|
|
|
|
|
|
|
wl_event_source_remove(d->udev_drm_source);
|
|
|
|
wl_event_source_remove(d->drm_source);
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_shutdown(ec);
|
2012-03-29 00:36:09 +04:00
|
|
|
|
2013-01-08 20:09:01 +04:00
|
|
|
ec->renderer->destroy(ec);
|
2012-09-07 05:44:24 +04:00
|
|
|
|
2012-02-24 06:45:32 +04:00
|
|
|
destroy_sprites(d);
|
2013-01-25 17:13:05 +04:00
|
|
|
|
|
|
|
if (d->gbm)
|
|
|
|
gbm_device_destroy(d->gbm);
|
|
|
|
|
2012-01-30 17:04:04 +04:00
|
|
|
if (weston_launcher_drm_set_master(&d->base, d->drm.fd, 0) < 0)
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to drop master: %m\n");
|
2011-01-14 22:59:13 +03:00
|
|
|
tty_destroy(d->tty);
|
2010-12-02 00:52:15 +03:00
|
|
|
|
2011-01-14 22:59:13 +03:00
|
|
|
free(d);
|
2010-12-02 00:52:15 +03:00
|
|
|
}
|
|
|
|
|
2012-01-18 20:48:46 +04:00
|
|
|
static void
|
|
|
|
drm_compositor_set_modes(struct drm_compositor *compositor)
|
|
|
|
{
|
|
|
|
struct drm_output *output;
|
|
|
|
struct drm_mode *drm_mode;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
wl_list_for_each(output, &compositor->base.output_list, base.link) {
|
2013-02-26 15:44:58 +04:00
|
|
|
if (!output->current) {
|
|
|
|
/* If something that would cause the output to
|
|
|
|
* switch mode happened while in another vt, we
|
|
|
|
* might not have a current drm_fb. In that case,
|
|
|
|
* schedule a repaint and let drm_output_repaint
|
|
|
|
* handle setting the mode. */
|
|
|
|
weston_output_schedule_repaint(&output->base);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2012-01-18 20:48:46 +04:00
|
|
|
drm_mode = (struct drm_mode *) output->base.current;
|
|
|
|
ret = drmModeSetCrtc(compositor->drm.fd, output->crtc_id,
|
2012-05-02 17:42:21 +04:00
|
|
|
output->current->fb_id, 0, 0,
|
2012-01-18 20:48:46 +04:00
|
|
|
&output->connector_id, 1,
|
|
|
|
&drm_mode->mode_info);
|
|
|
|
if (ret < 0) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log(
|
2012-03-12 02:27:41 +04:00
|
|
|
"failed to set mode %dx%d for output at %d,%d: %m\n",
|
2012-01-18 20:48:46 +04:00
|
|
|
drm_mode->base.width, drm_mode->base.height,
|
|
|
|
output->base.x, output->base.y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-06 23:15:37 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
vt_func(struct weston_compositor *compositor, int event)
|
2011-05-06 23:15:37 +04:00
|
|
|
{
|
|
|
|
struct drm_compositor *ec = (struct drm_compositor *) compositor;
|
2013-02-19 00:43:29 +04:00
|
|
|
struct udev_seat *seat;
|
2012-02-24 06:45:32 +04:00
|
|
|
struct drm_sprite *sprite;
|
2012-07-14 09:06:28 +04:00
|
|
|
struct drm_output *output;
|
2011-05-06 23:15:37 +04:00
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case TTY_ENTER_VT:
|
2012-08-03 15:39:10 +04:00
|
|
|
weston_log("entering VT\n");
|
2011-05-06 23:15:37 +04:00
|
|
|
compositor->focus = 1;
|
2012-01-30 17:04:04 +04:00
|
|
|
if (weston_launcher_drm_set_master(&ec->base, ec->drm.fd, 1)) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to set master: %m\n");
|
2012-01-16 19:52:52 +04:00
|
|
|
wl_display_terminate(compositor->wl_display);
|
|
|
|
}
|
2011-12-02 15:07:27 +04:00
|
|
|
compositor->state = ec->prev_state;
|
2012-01-18 20:48:46 +04:00
|
|
|
drm_compositor_set_modes(ec);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_damage_all(compositor);
|
2013-02-19 01:50:19 +04:00
|
|
|
wl_list_for_each(seat, &compositor->seat_list, base.link)
|
|
|
|
udev_seat_enable(seat, ec->udev);
|
2011-05-06 23:15:37 +04:00
|
|
|
break;
|
|
|
|
case TTY_LEAVE_VT:
|
2012-08-03 15:39:10 +04:00
|
|
|
weston_log("leaving VT\n");
|
2013-02-19 01:50:19 +04:00
|
|
|
wl_list_for_each(seat, &compositor->seat_list, base.link)
|
|
|
|
udev_seat_disable(seat);
|
2012-04-10 08:08:45 +04:00
|
|
|
|
2011-05-06 23:15:37 +04:00
|
|
|
compositor->focus = 0;
|
2011-12-02 15:07:27 +04:00
|
|
|
ec->prev_state = compositor->state;
|
2013-03-29 16:01:56 +04:00
|
|
|
weston_compositor_offscreen(compositor);
|
2011-05-06 23:38:28 +04:00
|
|
|
|
2012-01-18 20:50:31 +04:00
|
|
|
/* If we have a repaint scheduled (either from a
|
|
|
|
* pending pageflip or the idle handler), make sure we
|
|
|
|
* cancel that so we don't try to pageflip when we're
|
2013-03-29 16:01:56 +04:00
|
|
|
* vt switched away. The OFFSCREEN state will prevent
|
2012-01-18 20:50:31 +04:00
|
|
|
* further attemps at repainting. When we switch
|
|
|
|
* back, we schedule a repaint, which will process
|
|
|
|
* pending frame callbacks. */
|
|
|
|
|
2012-07-14 09:06:28 +04:00
|
|
|
wl_list_for_each(output, &ec->base.output_list, base.link) {
|
|
|
|
output->base.repaint_needed = 0;
|
|
|
|
drmModeSetCursor(ec->drm.fd, output->crtc_id, 0, 0, 0);
|
2012-01-18 20:50:31 +04:00
|
|
|
}
|
|
|
|
|
2012-07-14 09:06:28 +04:00
|
|
|
output = container_of(ec->base.output_list.next,
|
|
|
|
struct drm_output, base.link);
|
2012-02-24 06:45:32 +04:00
|
|
|
|
|
|
|
wl_list_for_each(sprite, &ec->sprite_list, link)
|
|
|
|
drmModeSetPlane(ec->drm.fd,
|
|
|
|
sprite->plane_id,
|
2012-07-14 09:06:28 +04:00
|
|
|
output->crtc_id, 0, 0,
|
2012-02-24 06:45:32 +04:00
|
|
|
0, 0, 0, 0, 0, 0, 0, 0);
|
|
|
|
|
2012-01-30 17:04:04 +04:00
|
|
|
if (weston_launcher_drm_set_master(&ec->base, ec->drm.fd, 0) < 0)
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to drop master: %m\n");
|
2012-01-16 19:52:52 +04:00
|
|
|
|
2011-05-06 23:15:37 +04:00
|
|
|
break;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2012-04-10 08:11:50 +04:00
|
|
|
static void
|
2012-05-30 19:31:58 +04:00
|
|
|
switch_vt_binding(struct wl_seat *seat, uint32_t time, uint32_t key, void *data)
|
2012-04-10 08:11:50 +04:00
|
|
|
{
|
|
|
|
struct drm_compositor *ec = data;
|
|
|
|
|
2012-05-30 19:31:58 +04:00
|
|
|
tty_activate_vt(ec->tty, key - KEY_F1 + 1);
|
2012-04-10 08:11:50 +04:00
|
|
|
}
|
|
|
|
|
2012-10-29 22:21:16 +04:00
|
|
|
/*
|
|
|
|
* Find primary GPU
|
|
|
|
* Some systems may have multiple DRM devices attached to a single seat. This
|
|
|
|
* function loops over all devices and tries to find a PCI device with the
|
|
|
|
* boot_vga sysfs attribute set to 1.
|
|
|
|
* If no such device is found, the first DRM device reported by udev is used.
|
|
|
|
*/
|
|
|
|
static struct udev_device*
|
|
|
|
find_primary_gpu(struct drm_compositor *ec, const char *seat)
|
|
|
|
{
|
|
|
|
struct udev_enumerate *e;
|
|
|
|
struct udev_list_entry *entry;
|
|
|
|
const char *path, *device_seat, *id;
|
|
|
|
struct udev_device *device, *drm_device, *pci;
|
|
|
|
|
|
|
|
e = udev_enumerate_new(ec->udev);
|
|
|
|
udev_enumerate_add_match_subsystem(e, "drm");
|
|
|
|
udev_enumerate_add_match_sysname(e, "card[0-9]*");
|
|
|
|
|
|
|
|
udev_enumerate_scan_devices(e);
|
|
|
|
drm_device = NULL;
|
|
|
|
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) {
|
|
|
|
path = udev_list_entry_get_name(entry);
|
|
|
|
device = udev_device_new_from_syspath(ec->udev, path);
|
|
|
|
if (!device)
|
|
|
|
continue;
|
|
|
|
device_seat = udev_device_get_property_value(device, "ID_SEAT");
|
|
|
|
if (!device_seat)
|
|
|
|
device_seat = default_seat;
|
|
|
|
if (strcmp(device_seat, seat)) {
|
|
|
|
udev_device_unref(device);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
pci = udev_device_get_parent_with_subsystem_devtype(device,
|
|
|
|
"pci", NULL);
|
|
|
|
if (pci) {
|
|
|
|
id = udev_device_get_sysattr_value(pci, "boot_vga");
|
|
|
|
if (id && !strcmp(id, "1")) {
|
|
|
|
if (drm_device)
|
|
|
|
udev_device_unref(drm_device);
|
|
|
|
drm_device = device;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!drm_device)
|
|
|
|
drm_device = device;
|
|
|
|
else
|
|
|
|
udev_device_unref(device);
|
|
|
|
}
|
|
|
|
|
|
|
|
udev_enumerate_unref(e);
|
|
|
|
return drm_device;
|
|
|
|
}
|
|
|
|
|
2012-10-31 19:55:46 +04:00
|
|
|
static void
|
2012-11-22 17:56:59 +04:00
|
|
|
planes_binding(struct wl_seat *seat, uint32_t time, uint32_t key, void *data)
|
2012-10-31 19:55:46 +04:00
|
|
|
{
|
|
|
|
struct drm_compositor *c = data;
|
|
|
|
|
2012-11-22 17:56:59 +04:00
|
|
|
switch (key) {
|
|
|
|
case KEY_C:
|
|
|
|
c->cursors_are_broken ^= 1;
|
|
|
|
break;
|
|
|
|
case KEY_V:
|
|
|
|
c->sprites_are_broken ^= 1;
|
|
|
|
break;
|
|
|
|
case KEY_O:
|
|
|
|
c->sprites_hidden ^= 1;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2012-11-21 17:11:37 +04:00
|
|
|
}
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
static struct weston_compositor *
|
2011-07-16 05:28:38 +04:00
|
|
|
drm_compositor_create(struct wl_display *display,
|
2013-01-25 17:13:05 +04:00
|
|
|
int connector, const char *seat, int tty, int pixman,
|
2013-02-21 00:27:49 +04:00
|
|
|
int *argc, char *argv[], const char *config_file)
|
2010-06-11 20:56:24 +04:00
|
|
|
{
|
2010-06-14 19:54:00 +04:00
|
|
|
struct drm_compositor *ec;
|
2012-10-29 22:21:16 +04:00
|
|
|
struct udev_device *drm_device;
|
2010-06-11 20:56:24 +04:00
|
|
|
struct wl_event_loop *loop;
|
2013-02-19 00:43:29 +04:00
|
|
|
struct udev_seat *udev_seat, *next;
|
2012-10-29 22:21:16 +04:00
|
|
|
const char *path;
|
2012-04-10 08:11:50 +04:00
|
|
|
uint32_t key;
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2012-06-09 00:45:33 +04:00
|
|
|
weston_log("initializing drm backend\n");
|
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
ec = malloc(sizeof *ec);
|
|
|
|
if (ec == NULL)
|
|
|
|
return NULL;
|
|
|
|
memset(ec, 0, sizeof *ec);
|
2012-06-22 17:04:36 +04:00
|
|
|
|
2012-11-02 18:14:40 +04:00
|
|
|
/* KMS support for sprites is not complete yet, so disable the
|
|
|
|
* functionality for now. */
|
|
|
|
ec->sprites_are_broken = 1;
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
ec->use_pixman = pixman;
|
|
|
|
|
2012-06-22 17:04:36 +04:00
|
|
|
if (weston_compositor_init(&ec->base, display, argc, argv,
|
2012-06-22 17:04:37 +04:00
|
|
|
config_file) < 0) {
|
2013-02-23 23:04:56 +04:00
|
|
|
weston_log("%s failed\n", __func__);
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_base;
|
|
|
|
}
|
2012-06-22 17:04:36 +04:00
|
|
|
|
2013-03-27 21:39:28 +04:00
|
|
|
/* Check if we run drm-backend using weston-launch */
|
2013-04-05 05:36:20 +04:00
|
|
|
if (ec->base.launcher_sock == -1 && geteuid() != 0) {
|
2013-03-27 21:39:28 +04:00
|
|
|
weston_log("fatal: drm backend should be run "
|
2013-04-05 05:36:20 +04:00
|
|
|
"using weston-launch binary or as root\n");
|
2013-03-27 21:39:28 +04:00
|
|
|
goto err_compositor;
|
|
|
|
}
|
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
ec->udev = udev_new();
|
|
|
|
if (ec->udev == NULL) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to initialize udev context\n");
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_compositor;
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
|
|
|
|
2012-01-15 23:29:09 +04:00
|
|
|
ec->base.wl_display = display;
|
|
|
|
ec->tty = tty_create(&ec->base, vt_func, tty);
|
|
|
|
if (!ec->tty) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to initialize tty\n");
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_udev;
|
2012-01-15 23:29:09 +04:00
|
|
|
}
|
|
|
|
|
2012-10-29 22:21:16 +04:00
|
|
|
drm_device = find_primary_gpu(ec, seat);
|
2011-07-16 05:28:38 +04:00
|
|
|
if (drm_device == NULL) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("no drm device found\n");
|
2012-10-29 22:21:16 +04:00
|
|
|
goto err_tty;
|
2010-06-14 19:54:00 +04:00
|
|
|
}
|
2012-10-29 22:21:16 +04:00
|
|
|
path = udev_device_get_syspath(drm_device);
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2013-01-25 17:13:02 +04:00
|
|
|
if (init_drm(ec, drm_device) < 0) {
|
|
|
|
weston_log("failed to initialize kms\n");
|
|
|
|
goto err_udev_dev;
|
|
|
|
}
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
if (ec->use_pixman) {
|
|
|
|
if (init_pixman(ec) < 0) {
|
|
|
|
weston_log("failed to initialize pixman renderer\n");
|
|
|
|
goto err_udev_dev;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (init_egl(ec) < 0) {
|
|
|
|
weston_log("failed to initialize egl\n");
|
|
|
|
goto err_udev_dev;
|
|
|
|
}
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
2011-01-15 00:20:21 +03:00
|
|
|
|
|
|
|
ec->base.destroy = drm_destroy;
|
2012-07-31 22:32:01 +04:00
|
|
|
ec->base.restore = drm_restore;
|
2011-04-20 13:02:58 +04:00
|
|
|
|
2011-01-15 00:20:21 +03:00
|
|
|
ec->base.focus = 1;
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
ec->prev_state = WESTON_COMPOSITOR_ACTIVE;
|
2011-12-02 15:07:27 +04:00
|
|
|
|
2012-04-10 08:11:50 +04:00
|
|
|
for (key = KEY_F1; key < KEY_F9; key++)
|
2012-05-30 19:31:58 +04:00
|
|
|
weston_compositor_add_key_binding(&ec->base, key,
|
|
|
|
MODIFIER_CTRL | MODIFIER_ALT,
|
|
|
|
switch_vt_binding, ec);
|
2012-04-10 08:11:50 +04:00
|
|
|
|
2012-02-23 18:45:49 +04:00
|
|
|
wl_list_init(&ec->sprite_list);
|
|
|
|
create_sprites(ec);
|
|
|
|
|
2012-02-29 21:53:50 +04:00
|
|
|
if (create_outputs(ec, connector, drm_device) < 0) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to create output for %s\n", path);
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_sprite;
|
2010-06-14 19:54:00 +04:00
|
|
|
}
|
|
|
|
|
2011-10-07 10:27:26 +04:00
|
|
|
path = NULL;
|
|
|
|
|
2013-02-19 00:43:29 +04:00
|
|
|
if (udev_seat_create(&ec->base, ec->udev, seat) == NULL) {
|
2013-02-16 23:29:24 +04:00
|
|
|
weston_log("failed to create input devices\n");
|
|
|
|
goto err_sprite;
|
|
|
|
}
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
loop = wl_display_get_event_loop(ec->base.wl_display);
|
|
|
|
ec->drm_source =
|
2011-03-02 13:14:59 +03:00
|
|
|
wl_event_loop_add_fd(loop, ec->drm.fd,
|
2010-06-14 19:54:00 +04:00
|
|
|
WL_EVENT_READABLE, on_drm_input, ec);
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2011-03-15 17:08:41 +03:00
|
|
|
ec->udev_monitor = udev_monitor_new_from_netlink(ec->udev, "udev");
|
|
|
|
if (ec->udev_monitor == NULL) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to intialize udev monitor\n");
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_drm_source;
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
udev_monitor_filter_add_match_subsystem_devtype(ec->udev_monitor,
|
|
|
|
"drm", NULL);
|
|
|
|
ec->udev_drm_source =
|
2011-08-30 13:38:26 +04:00
|
|
|
wl_event_loop_add_fd(loop,
|
|
|
|
udev_monitor_get_fd(ec->udev_monitor),
|
2011-03-15 17:08:41 +03:00
|
|
|
WL_EVENT_READABLE, udev_drm_event, ec);
|
|
|
|
|
|
|
|
if (udev_monitor_enable_receiving(ec->udev_monitor) < 0) {
|
2012-06-07 20:01:59 +04:00
|
|
|
weston_log("failed to enable udev-monitor receiving\n");
|
2012-06-22 17:04:37 +04:00
|
|
|
goto err_udev_monitor;
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
|
2012-06-22 17:04:37 +04:00
|
|
|
udev_device_unref(drm_device);
|
|
|
|
|
2012-11-08 19:20:45 +04:00
|
|
|
weston_compositor_add_debug_binding(&ec->base, KEY_O,
|
2012-11-22 17:56:59 +04:00
|
|
|
planes_binding, ec);
|
2012-11-21 17:11:37 +04:00
|
|
|
weston_compositor_add_debug_binding(&ec->base, KEY_C,
|
2012-11-22 17:56:59 +04:00
|
|
|
planes_binding, ec);
|
|
|
|
weston_compositor_add_debug_binding(&ec->base, KEY_V,
|
|
|
|
planes_binding, ec);
|
2012-10-31 19:55:46 +04:00
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
return &ec->base;
|
2012-06-22 17:04:37 +04:00
|
|
|
|
|
|
|
err_udev_monitor:
|
|
|
|
wl_event_source_remove(ec->udev_drm_source);
|
|
|
|
udev_monitor_unref(ec->udev_monitor);
|
|
|
|
err_drm_source:
|
|
|
|
wl_event_source_remove(ec->drm_source);
|
2013-02-19 00:43:29 +04:00
|
|
|
wl_list_for_each_safe(udev_seat, next, &ec->base.seat_list, base.link)
|
|
|
|
udev_seat_destroy(udev_seat);
|
2012-09-07 04:51:00 +04:00
|
|
|
err_sprite:
|
2013-01-08 20:09:01 +04:00
|
|
|
ec->base.renderer->destroy(&ec->base);
|
2012-11-13 22:10:19 +04:00
|
|
|
gbm_device_destroy(ec->gbm);
|
2012-09-07 04:51:00 +04:00
|
|
|
destroy_sprites(ec);
|
2012-06-22 17:04:37 +04:00
|
|
|
err_udev_dev:
|
|
|
|
udev_device_unref(drm_device);
|
2012-10-29 22:21:16 +04:00
|
|
|
err_tty:
|
2013-02-19 00:02:27 +04:00
|
|
|
if (weston_launcher_drm_set_master(&ec->base, ec->drm.fd, 0) < 0)
|
|
|
|
weston_log("failed to drop master: %m\n");
|
2012-06-22 17:04:37 +04:00
|
|
|
tty_destroy(ec->tty);
|
|
|
|
err_udev:
|
|
|
|
udev_unref(ec->udev);
|
|
|
|
err_compositor:
|
|
|
|
weston_compositor_shutdown(&ec->base);
|
|
|
|
err_base:
|
|
|
|
free(ec);
|
|
|
|
return NULL;
|
2010-06-11 20:56:24 +04:00
|
|
|
}
|
2011-05-03 06:09:20 +04:00
|
|
|
|
2012-08-01 01:30:41 +04:00
|
|
|
static int
|
|
|
|
set_sync_flags(drmModeModeInfo *mode, char *hsync, char *vsync)
|
|
|
|
{
|
|
|
|
mode->flags = 0;
|
|
|
|
|
|
|
|
if (strcmp(hsync, "+hsync") == 0)
|
|
|
|
mode->flags |= DRM_MODE_FLAG_PHSYNC;
|
|
|
|
else if (strcmp(hsync, "-hsync") == 0)
|
|
|
|
mode->flags |= DRM_MODE_FLAG_NHSYNC;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (strcmp(vsync, "+vsync") == 0)
|
|
|
|
mode->flags |= DRM_MODE_FLAG_PVSYNC;
|
|
|
|
else if (strcmp(vsync, "-vsync") == 0)
|
|
|
|
mode->flags |= DRM_MODE_FLAG_NVSYNC;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_for_modeline(struct drm_configured_output *output)
|
|
|
|
{
|
|
|
|
drmModeModeInfo mode;
|
|
|
|
char hsync[16];
|
|
|
|
char vsync[16];
|
|
|
|
char mode_name[16];
|
|
|
|
float fclock;
|
|
|
|
|
|
|
|
mode.type = DRM_MODE_TYPE_USERDEF;
|
|
|
|
mode.hskew = 0;
|
|
|
|
mode.vscan = 0;
|
|
|
|
mode.vrefresh = 0;
|
|
|
|
|
|
|
|
if (sscanf(output_mode, "%f %hd %hd %hd %hd %hd %hd %hd %hd %s %s",
|
|
|
|
&fclock, &mode.hdisplay,
|
|
|
|
&mode.hsync_start,
|
|
|
|
&mode.hsync_end, &mode.htotal,
|
|
|
|
&mode.vdisplay,
|
|
|
|
&mode.vsync_start,
|
|
|
|
&mode.vsync_end, &mode.vtotal,
|
|
|
|
hsync, vsync) == 11) {
|
|
|
|
if (set_sync_flags(&mode, hsync, vsync))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
sprintf(mode_name, "%dx%d", mode.hdisplay, mode.vdisplay);
|
|
|
|
strcpy(mode.name, mode_name);
|
|
|
|
|
|
|
|
mode.clock = fclock * 1000;
|
|
|
|
} else
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
output->crtc_mode = mode;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-18 11:04:05 +04:00
|
|
|
static void
|
|
|
|
drm_output_set_transform(struct drm_configured_output *output)
|
|
|
|
{
|
|
|
|
if (!output_transform) {
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(output_transform, "normal"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
|
|
else if (!strcmp(output_transform, "90"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_90;
|
|
|
|
else if (!strcmp(output_transform, "180"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_180;
|
|
|
|
else if (!strcmp(output_transform, "270"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_270;
|
|
|
|
else if (!strcmp(output_transform, "flipped"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_FLIPPED;
|
|
|
|
else if (!strcmp(output_transform, "flipped-90"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_FLIPPED_90;
|
|
|
|
else if (!strcmp(output_transform, "flipped-180"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_FLIPPED_180;
|
|
|
|
else if (!strcmp(output_transform, "flipped-270"))
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_FLIPPED_270;
|
|
|
|
else {
|
|
|
|
weston_log("Invalid transform \"%s\" for output %s\n",
|
|
|
|
output_transform, output_name);
|
|
|
|
output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(output_transform);
|
|
|
|
output_transform = NULL;
|
|
|
|
}
|
|
|
|
|
2012-07-31 05:51:08 +04:00
|
|
|
static void
|
|
|
|
output_section_done(void *data)
|
|
|
|
{
|
|
|
|
struct drm_configured_output *output;
|
|
|
|
|
|
|
|
output = malloc(sizeof *output);
|
|
|
|
|
2012-08-18 11:04:05 +04:00
|
|
|
if (!output || !output_name || (output_name[0] == 'X') ||
|
|
|
|
(!output_mode && !output_transform)) {
|
2012-08-01 06:18:28 +04:00
|
|
|
free(output_name);
|
|
|
|
free(output_mode);
|
2012-08-18 11:04:05 +04:00
|
|
|
free(output_transform);
|
2012-10-09 21:44:35 +04:00
|
|
|
free(output);
|
2012-08-18 11:04:05 +04:00
|
|
|
output_name = NULL;
|
2012-08-01 06:18:28 +04:00
|
|
|
output_mode = NULL;
|
2012-08-18 11:04:05 +04:00
|
|
|
output_transform = NULL;
|
2012-07-31 05:51:08 +04:00
|
|
|
return;
|
2012-08-01 06:18:28 +04:00
|
|
|
}
|
2012-07-31 05:51:08 +04:00
|
|
|
|
|
|
|
output->config = OUTPUT_CONFIG_INVALID;
|
|
|
|
output->name = output_name;
|
|
|
|
output->mode = output_mode;
|
|
|
|
|
2012-08-18 11:04:05 +04:00
|
|
|
if (output_mode) {
|
|
|
|
if (strcmp(output_mode, "off") == 0)
|
|
|
|
output->config = OUTPUT_CONFIG_OFF;
|
|
|
|
else if (strcmp(output_mode, "preferred") == 0)
|
|
|
|
output->config = OUTPUT_CONFIG_PREFERRED;
|
|
|
|
else if (strcmp(output_mode, "current") == 0)
|
|
|
|
output->config = OUTPUT_CONFIG_CURRENT;
|
|
|
|
else if (sscanf(output_mode, "%dx%d",
|
|
|
|
&output->width, &output->height) == 2)
|
|
|
|
output->config = OUTPUT_CONFIG_MODE;
|
|
|
|
else if (check_for_modeline(output) == 0)
|
|
|
|
output->config = OUTPUT_CONFIG_MODELINE;
|
|
|
|
|
|
|
|
if (output->config == OUTPUT_CONFIG_INVALID)
|
|
|
|
weston_log("Invalid mode \"%s\" for output %s\n",
|
|
|
|
output_mode, output_name);
|
|
|
|
output_mode = NULL;
|
2012-07-31 05:51:08 +04:00
|
|
|
}
|
2012-08-18 11:04:05 +04:00
|
|
|
|
|
|
|
drm_output_set_transform(output);
|
|
|
|
|
|
|
|
wl_list_insert(&configured_output_list, &output->link);
|
|
|
|
|
|
|
|
if (output_transform)
|
|
|
|
free(output_transform);
|
|
|
|
output_transform = NULL;
|
2012-07-31 05:51:08 +04:00
|
|
|
}
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
WL_EXPORT struct weston_compositor *
|
2013-02-21 00:27:49 +04:00
|
|
|
backend_init(struct wl_display *display, int *argc, char *argv[],
|
2012-06-01 19:14:02 +04:00
|
|
|
const char *config_file)
|
2011-05-03 06:09:20 +04:00
|
|
|
{
|
2013-01-25 17:13:05 +04:00
|
|
|
int connector = 0, tty = 0, use_pixman = 0;
|
2012-03-12 05:05:57 +04:00
|
|
|
const char *seat = default_seat;
|
|
|
|
|
|
|
|
const struct weston_option drm_options[] = {
|
|
|
|
{ WESTON_OPTION_INTEGER, "connector", 0, &connector },
|
|
|
|
{ WESTON_OPTION_STRING, "seat", 0, &seat },
|
|
|
|
{ WESTON_OPTION_INTEGER, "tty", 0, &tty },
|
2012-06-28 19:28:15 +04:00
|
|
|
{ WESTON_OPTION_BOOLEAN, "current-mode", 0, &option_current_mode },
|
2013-01-25 17:13:05 +04:00
|
|
|
{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
|
2012-03-12 05:05:57 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
parse_options(drm_options, ARRAY_LENGTH(drm_options), argc, argv);
|
2011-05-03 06:09:20 +04:00
|
|
|
|
2012-07-31 05:51:08 +04:00
|
|
|
wl_list_init(&configured_output_list);
|
|
|
|
|
|
|
|
const struct config_key drm_config_keys[] = {
|
|
|
|
{ "name", CONFIG_KEY_STRING, &output_name },
|
|
|
|
{ "mode", CONFIG_KEY_STRING, &output_mode },
|
2012-08-18 11:04:05 +04:00
|
|
|
{ "transform", CONFIG_KEY_STRING, &output_transform },
|
2012-07-31 05:51:08 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
const struct config_section config_section[] = {
|
|
|
|
{ "output", drm_config_keys,
|
|
|
|
ARRAY_LENGTH(drm_config_keys), output_section_done },
|
|
|
|
};
|
|
|
|
|
|
|
|
parse_config_file(config_file, config_section,
|
|
|
|
ARRAY_LENGTH(config_section), NULL);
|
|
|
|
|
2013-01-25 17:13:05 +04:00
|
|
|
return drm_compositor_create(display, connector, seat, tty, use_pixman,
|
|
|
|
argc, argv, config_file);
|
2011-05-03 06:09:20 +04:00
|
|
|
}
|