static int option_current_mode = 0;
static char *output_name;
static char *output_mode;
+static char *output_transform;
static struct wl_list configured_output_list;
enum output_config {
struct drm_configured_output {
char *name;
char *mode;
+ uint32_t transform;
int32_t width, height;
drmModeModeInfo crtc_mode;
enum output_config config;
uint32_t connector_allocator;
struct tty *tty;
- struct gbm_surface *dummy_surface;
- EGLSurface dummy_egl_surface;
+ /* we need these parameters in order to not fail drmModeAddFB2()
+ * due to out of bounds dimensions, and then mistakenly set
+ * sprites_are_broken:
+ */
+ int32_t min_width, max_width;
+ int32_t min_height, max_height;
struct wl_list sprite_list;
int sprites_are_broken;
+ int cursors_are_broken;
+
uint32_t prev_state;
};
char *name;
uint32_t crtc_id;
+ int pipe;
uint32_t connector_id;
drmModeCrtcPtr original_crtc;
struct weston_plane fb_plane;
struct weston_surface *cursor_surface;
int current_cursor;
- EGLSurface egl_surface;
struct drm_fb *current, *next;
struct backlight *backlight;
};
bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
es->buffer, GBM_BO_USE_SCANOUT);
+ /* Unable to use the buffer for scanout */
+ if (!bo)
+ return NULL;
+
/* Need to verify output->region contained in surface opaque
* region. Or maybe just that format doesn't have alpha.
* For now, scanout only if format is XRGB8888. */
static void
drm_output_render(struct drm_output *output, pixman_region32_t *damage)
{
- struct drm_compositor *compositor =
- (struct drm_compositor *) output->base.compositor;
- struct weston_surface *surface;
+ struct weston_compositor *ec = output->base.compositor;
struct gbm_bo *bo;
- if (!eglMakeCurrent(compositor->base.egl_display, output->egl_surface,
- output->egl_surface,
- compositor->base.egl_context)) {
- weston_log("failed to make current\n");
- return;
- }
-
- wl_list_for_each_reverse(surface, &compositor->base.surface_list, link)
- if (surface->plane == &compositor->base.primary_plane)
- weston_surface_draw(surface, &output->base, damage);
-
- wl_signal_emit(&output->base.frame_signal, output);
+ ec->renderer->repaint_output(&output->base, damage);
- eglSwapBuffers(compositor->base.egl_display, output->egl_surface);
bo = gbm_surface_lock_front_buffer(output->surface);
if (!bo) {
weston_log("failed to lock front buffer: %m\n");
weston_log("setplane failed: %d: %s\n",
ret, strerror(errno));
+ if (output->pipe > 0)
+ vbl.request.type |= DRM_VBLANK_SECONDARY;
+
/*
* Queue a vblank signal so we know when the surface
* becomes active on the display or has been replaced.
pixman_box32_t *box;
uint32_t format;
wl_fixed_t sx1, sy1, sx2, sy2;
+ int32_t width, height;
if (c->sprites_are_broken)
return NULL;
if (es->buffer == NULL)
return NULL;
+ if (wl_buffer_is_shm(es->buffer))
+ return NULL;
+
if (!drm_surface_transform_supported(es))
return NULL;
if (!found)
return NULL;
+ width = es->geometry.width;
+ height = es->geometry.height;
+
+ /* If geometry is out of bounds, don't even bother trying because
+ * we know the AddFB2() call will fail:
+ */
+ if (c->min_width > width || width > c->max_width ||
+ c->min_height > height || height > c->max_height)
+ return NULL;
+
bo = gbm_bo_import(c->gbm, GBM_BO_IMPORT_WL_BUFFER,
es->buffer, GBM_BO_USE_SCANOUT);
if (!bo)
pitches[0] = stride;
offsets[0] = 0;
- ret = drmModeAddFB2(c->drm.fd, es->geometry.width, es->geometry.height,
+ ret = drmModeAddFB2(c->drm.fd, width, height,
format, handles, pitches, offsets,
&fb_id, 0);
if (ret) {
/*
* Calculate the source & dest rects properly based on actual
- * postion (note the caller has called weston_surface_update_transform()
+ * position (note the caller has called weston_surface_update_transform()
* for us already).
*/
pixman_region32_init(&dest_rect);
drm_output_prepare_cursor_surface(struct weston_output *output_base,
struct weston_surface *es)
{
+ struct drm_compositor *c =
+ (struct drm_compositor *) output_base->compositor;
struct drm_output *output = (struct drm_output *) output_base;
if (output->cursor_surface)
return NULL;
if (es->output_mask != (1u << output_base->id))
return NULL;
+ if (c->cursors_are_broken)
+ return NULL;
if (es->buffer == NULL || !wl_buffer_is_shm(es->buffer) ||
es->geometry.width > 64 || es->geometry.height > 64)
return NULL;
handle = gbm_bo_get_handle(bo).s32;
if (drmModeSetCursor(c->drm.fd,
- output->crtc_id, handle, 64, 64))
+ output->crtc_id, handle, 64, 64)) {
weston_log("failed to set cursor: %m\n");
+ c->cursors_are_broken = 1;
+ }
}
x = es->geometry.x - output->base.x;
y = es->geometry.y - output->base.y;
if (output->cursor_plane.x != x || output->cursor_plane.y != y) {
- if (drmModeMoveCursor(c->drm.fd, output->crtc_id, x, y))
+ if (drmModeMoveCursor(c->drm.fd, output->crtc_id, x, y)) {
weston_log("failed to move cursor: %m\n");
+ c->cursors_are_broken = 1;
+ }
+
output->cursor_plane.x = x;
output->cursor_plane.y = y;
}
c->crtc_allocator &= ~(1 << output->crtc_id);
c->connector_allocator &= ~(1 << output->connector_id);
- eglDestroySurface(c->base.egl_display, output->egl_surface);
+ eglDestroySurface(c->base.egl_display, output->base.egl_surface);
gbm_surface_destroy(output->surface);
weston_plane_release(&output->fb_plane);
}
output->next = NULL;
- eglDestroySurface(ec->base.egl_display, output->egl_surface);
+ eglDestroySurface(ec->base.egl_display, output->base.egl_surface);
gbm_surface_destroy(output->surface);
- output->egl_surface = egl_surface;
+ output->base.egl_surface = egl_surface;
output->surface = surface;
/*update output*/
EGLint major, minor, n;
const char *filename, *sysnum;
int fd;
- static const EGLint context_attribs[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_NONE
- };
-
static const EGLint config_attribs[] = {
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_RED_SIZE, 1,
return -1;
}
- if (!eglBindAPI(EGL_OPENGL_ES_API)) {
- weston_log("failed to bind api EGL_OPENGL_ES_API\n");
- return -1;
- }
-
if (!eglChooseConfig(ec->base.egl_display, config_attribs,
&ec->base.egl_config, 1, &n) || n != 1) {
weston_log("failed to choose config: %d\n", n);
return -1;
}
- ec->base.egl_context =
- eglCreateContext(ec->base.egl_display, ec->base.egl_config,
- EGL_NO_CONTEXT, context_attribs);
- if (ec->base.egl_context == NULL) {
- weston_log("failed to create context\n");
- return -1;
- }
-
- ec->dummy_surface = gbm_surface_create(ec->gbm, 10, 10,
- GBM_FORMAT_XRGB8888,
- GBM_BO_USE_RENDERING);
- if (!ec->dummy_surface) {
- weston_log("failed to create dummy gbm surface\n");
- return -1;
- }
-
- ec->dummy_egl_surface =
- eglCreateWindowSurface(ec->base.egl_display,
- ec->base.egl_config,
- ec->dummy_surface,
- NULL);
- if (ec->dummy_egl_surface == EGL_NO_SURFACE) {
- weston_log("failed to create egl surface\n");
- return -1;
- }
-
- if (!eglMakeCurrent(ec->base.egl_display, ec->dummy_egl_surface,
- ec->dummy_egl_surface, ec->base.egl_context)) {
- weston_log("failed to make context current\n");
- return -1;
- }
-
return 0;
}
-static int
+static struct drm_mode *
drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
{
struct drm_mode *mode;
mode = malloc(sizeof *mode);
if (mode == NULL)
- return -1;
+ return NULL;
mode->base.flags = 0;
mode->base.width = info->hdisplay;
wl_list_insert(output->base.mode_list.prev, &mode->base.link);
- return 0;
+ return mode;
}
static int
int x, int y, struct udev_device *drm_device)
{
struct drm_output *output;
- struct drm_mode *drm_mode, *next;
- struct weston_mode *m, *preferred, *current, *configured;
+ struct drm_mode *drm_mode, *next, *preferred, *current, *configured;
+ struct weston_mode *m;
struct drm_configured_output *o = NULL, *temp;
drmModeEncoder *encoder;
drmModeModeInfo crtc_mode;
drmModeCrtc *crtc;
- int i, ret;
+ int i;
char name[32];
const char *type_name;
output->name = strdup(name);
output->crtc_id = resources->crtcs[i];
+ output->pipe = i;
ec->crtc_allocator |= (1 << output->crtc_id);
output->connector_id = connector->connector_id;
ec->connector_allocator |= (1 << output->connector_id);
}
for (i = 0; i < connector->count_modes; i++) {
- ret = drm_output_add_mode(output, &connector->modes[i]);
- if (ret)
+ drm_mode = drm_output_add_mode(output, &connector->modes[i]);
+ if (!drm_mode)
goto err_free;
}
wl_list_for_each(temp, &configured_output_list, link) {
if (strcmp(temp->name, output->name) == 0) {
- weston_log("%s mode \"%s\" in config\n",
+ if (temp->mode)
+ weston_log("%s mode \"%s\" in config\n",
temp->name, temp->mode);
o = temp;
break;
}
}
- if (o && strcmp("off", o->mode) == 0) {
+ if (o && o->config == OUTPUT_CONFIG_OFF) {
weston_log("Disabling output %s\n", o->name);
drmModeSetCrtc(ec->drm.fd, output->crtc_id,
}
wl_list_for_each(drm_mode, &output->base.mode_list, base.link) {
- if (o && o->width == drm_mode->base.width &&
- o->height == drm_mode->base.height &&
- o->config == OUTPUT_CONFIG_MODE)
- configured = &drm_mode->base;
+ if (o && o->config == OUTPUT_CONFIG_MODE &&
+ o->width == drm_mode->base.width &&
+ o->height == drm_mode->base.height)
+ configured = drm_mode;
if (!memcmp(&crtc_mode, &drm_mode->mode_info, sizeof crtc_mode))
- current = &drm_mode->base;
+ current = drm_mode;
if (drm_mode->base.flags & WL_OUTPUT_MODE_PREFERRED)
- preferred = &drm_mode->base;
+ preferred = drm_mode;
}
if (o && o->config == OUTPUT_CONFIG_MODELINE) {
- ret = drm_output_add_mode(output, &o->crtc_mode);
- if (ret)
+ configured = drm_output_add_mode(output, &o->crtc_mode);
+ if (!configured)
goto err_free;
- configured = container_of(output->base.mode_list.prev,
- struct weston_mode, link);
current = configured;
}
if (current == NULL && crtc_mode.clock != 0) {
- ret = drm_output_add_mode(output, &crtc_mode);
- if (ret)
+ current = drm_output_add_mode(output, &crtc_mode);
+ if (!current)
goto err_free;
- current = container_of(output->base.mode_list.prev,
- struct weston_mode, link);
}
if (o && o->config == OUTPUT_CONFIG_CURRENT)
configured = current;
if (option_current_mode && current)
- output->base.current = current;
+ output->base.current = ¤t->base;
else if (configured)
- output->base.current = configured;
+ output->base.current = &configured->base;
else if (preferred)
- output->base.current = preferred;
+ output->base.current = &preferred->base;
else if (current)
- output->base.current = current;
+ output->base.current = ¤t->base;
if (output->base.current == NULL) {
weston_log("no available modes for %s\n", output->name);
goto err_free;
}
- output->egl_surface =
+ output->base.egl_surface =
eglCreateWindowSurface(ec->base.egl_display,
ec->base.egl_config,
output->surface,
NULL);
- if (output->egl_surface == EGL_NO_SURFACE) {
+ if (output->base.egl_surface == EGL_NO_SURFACE) {
weston_log("failed to create egl surface\n");
goto err_surface;
}
weston_output_init(&output->base, &ec->base, x, y,
connector->mmWidth, connector->mmHeight,
- WL_OUTPUT_FLIPPED);
+ o ? o->transform : WL_OUTPUT_TRANSFORM_NORMAL);
wl_list_insert(ec->base.output_list.prev, &output->base.link);
return -1;
}
+ ec->min_width = resources->min_width;
+ ec->max_width = resources->max_width;
+ ec->min_height = resources->min_height;
+ ec->max_height = resources->max_height;
+
ec->num_crtcs = resources->count_crtcs;
memcpy(ec->crtcs, resources->crtcs, sizeof(uint32_t) * ec->num_crtcs);
x += container_of(ec->base.output_list.prev,
struct weston_output,
- link)->current->width;
+ link)->width;
}
drmModeFreeConnector(connector);
/* XXX: not yet needed, we die with 0 outputs */
if (!wl_list_empty(&ec->base.output_list))
- x = last->x + last->current->width;
+ x = last->x + last->width;
else
x = 0;
y = 0;
disconnects &= ~(1 << output->connector_id);
weston_log("connector %d disconnected\n",
output->connector_id);
- x_offset += output->base.current->width;
+ x_offset += output->base.width;
drm_output_destroy(&output->base);
}
}
device_added(struct udev_device *udev_device, struct drm_seat *master)
{
struct weston_compositor *c;
- struct evdev_input_device *device;
+ struct evdev_device *device;
const char *devnode;
const char *device_seat;
int fd;
devnode = udev_device_get_devnode(udev_device);
/* Use non-blocking mode so that we can loop on read on
- * evdev_input_device_data() until all events on the fd are
+ * evdev_device_data() until all events on the fd are
* read. mtdev_get() also expects this. */
fd = weston_launcher_open(c, devnode, O_RDWR | O_NONBLOCK);
if (fd < 0) {
return;
}
- device = evdev_input_device_create(&master->base, devnode, fd);
+ device = evdev_device_create(&master->base, devnode, fd);
if (!device) {
close(fd);
weston_log("not using input device '%s'.\n", devnode);
{
struct drm_seat *seat = data;
struct udev_device *udev_device;
- struct evdev_input_device *device, *next;
+ struct evdev_device *device, *next;
const char *action;
const char *devnode;
if (!strcmp(device->devnode, devnode)) {
weston_log("input device %s, %s removed\n",
device->devname, device->devnode);
- evdev_input_device_destroy(device);
+ evdev_device_destroy(device);
break;
}
}
drm_led_update(struct weston_seat *seat_base, enum weston_led leds)
{
struct drm_seat *seat = (struct drm_seat *) seat_base;
- struct evdev_input_device *device;
+ struct evdev_device *device;
wl_list_for_each(device, &seat->devices_list, link)
evdev_led_update(device, leds);
}
evdev_add_devices(udev, &seat->base);
-
- c->seat = &seat->base;
}
static void
evdev_remove_devices(struct weston_seat *seat_base)
{
struct drm_seat *seat = (struct drm_seat *) seat_base;
- struct evdev_input_device *device, *next;
+ struct evdev_device *device, *next;
wl_list_for_each_safe(device, next, &seat->devices_list, link)
- evdev_input_device_destroy(device);
+ evdev_device_destroy(device);
if (seat->base.seat.keyboard)
- notify_keyboard_focus_out(&seat->base.seat);
+ notify_keyboard_focus_out(&seat->base);
}
static void
weston_compositor_shutdown(ec);
+ gles2_renderer_destroy(ec);
+
/* Work around crash in egl_dri2.c's dri2_make_current() */
eglMakeCurrent(ec->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
ec->prev_state = WESTON_COMPOSITOR_ACTIVE;
- if (weston_compositor_init_gl(&ec->base) < 0)
- goto err_egl;
-
for (key = KEY_F1; key < KEY_F9; key++)
weston_compositor_add_key_binding(&ec->base, key,
MODIFIER_CTRL | MODIFIER_ALT,
goto err_sprite;
}
+ if (gles2_renderer_init(&ec->base) < 0)
+ goto err_egl;
+
path = NULL;
evdev_input_create(&ec->base, ec->udev, seat);
wl_event_source_remove(ec->drm_source);
wl_list_for_each_safe(weston_seat, next, &ec->base.seat_list, link)
evdev_input_destroy(weston_seat);
-err_sprite:
- destroy_sprites(ec);
err_egl:
eglMakeCurrent(ec->base.egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
eglTerminate(ec->base.egl_display);
eglReleaseThread();
gbm_device_destroy(ec->gbm);
+err_sprite:
+ destroy_sprites(ec);
err_udev_dev:
udev_device_unref(drm_device);
err_udev_enum:
}
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;
+}
+
+static void
output_section_done(void *data)
{
struct drm_configured_output *output;
output = malloc(sizeof *output);
- if (!output || !output_name || !output_mode) {
+ if (!output || !output_name || (output_name[0] == 'X') ||
+ (!output_mode && !output_transform)) {
free(output_name);
- output_name = NULL;
free(output_mode);
+ free(output_transform);
+ free(output);
+ output_name = NULL;
output_mode = NULL;
+ output_transform = NULL;
return;
}
output->name = output_name;
output->mode = 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)
- wl_list_insert(&configured_output_list, &output->link);
- else {
- weston_log("Invalid mode \"%s\" for output %s\n",
- output_mode, output_name);
- drm_free_configured_output(output);
+ 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;
}
+
+ drm_output_set_transform(output);
+
+ wl_list_insert(&configured_output_list, &output->link);
+
+ if (output_transform)
+ free(output_transform);
+ output_transform = NULL;
}
WL_EXPORT struct weston_compositor *
const struct config_key drm_config_keys[] = {
{ "name", CONFIG_KEY_STRING, &output_name },
{ "mode", CONFIG_KEY_STRING, &output_mode },
+ { "transform", CONFIG_KEY_STRING, &output_transform },
};
const struct config_section config_section[] = {
projects / profile / ivi / weston.git / blobdiff