hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-12-23 02:19:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #44 from ascent12/drm

Browse source 
DRM plane support, refactoring, and other changes
This commit is contained in:
Drew DeVault 2017-08-07 08:01:32 -04:00 committed by GitHub
commit ab063c3936
13 changed files with 1348 additions and 572 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
backend/drm/backend.c
View file

@ -15,24 +15,27 @@
#include "backend/udev.h"
#include "backend/drm.h"
static bool wlr_drm_backend_init(struct wlr_backend_state *state) {
wlr_drm_scan_connectors(state);
static bool wlr_drm_backend_init(struct wlr_backend_state *drm) {
wlr_drm_scan_connectors(drm);
return true;
}
static void wlr_drm_backend_destroy(struct wlr_backend_state *state) {
if (!state) {
static void wlr_drm_backend_destroy(struct wlr_backend_state *drm) {
if (!drm) {
return;
}
for (size_t i = 0; state->outputs && i < state->outputs->length; ++i) {
struct wlr_output_state *output = state->outputs->items[i];
wlr_output_destroy(output->wlr_output);
for (size_t i = 0; drm->outputs && i < drm->outputs->length; ++i) {
struct wlr_output_state *output = drm->outputs->items[i];
wlr_output_destroy(output->base);
}
wlr_udev_signal_remove(state->udev, &state->drm_invalidated);
wlr_drm_renderer_free(&state->renderer);
wlr_session_close_file(state->session, state->fd);
wl_event_source_remove(state->drm_event);
free(state);
wlr_udev_signal_remove(drm->udev, &drm->drm_invalidated);
wlr_drm_renderer_free(&drm->renderer);
wlr_drm_resources_free(drm);
wlr_session_close_file(drm->session, drm->fd);
wl_event_source_remove(drm->drm_event);
free(drm);
}
static struct wlr_backend_impl backend_impl = {
@ -50,14 +53,10 @@ static void session_signal(struct wl_listener *listener, void *data) {
for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_output_state *output = drm->outputs->items[i];
wlr_drm_output_start_renderer(output);
wlr_drm_crtc_set_cursor(drm, output->crtc);
}
} else {
wlr_log(L_INFO, "DRM fd paused");
for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_output_state *output = drm->outputs->items[i];
wlr_drm_output_pause_renderer(output);
}
}
}
@ -76,64 +75,68 @@ static void drm_invalidated(struct wl_listener *listener, void *data) {
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
struct wlr_session *session, struct wlr_udev *udev, int gpu_fd) {
assert(display && session && gpu_fd > 0);
assert(display && session && gpu_fd >= 0);
char *name = drmGetDeviceNameFromFd2(gpu_fd);
drmVersion *version = drmGetVersion(gpu_fd);
wlr_log(L_INFO, "Initalizing DRM backend for %s (%s)", name, version->name);
free(name);
drmFreeVersion(version);
struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state));
if (!state) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
struct wlr_backend_state *drm = calloc(1, sizeof(*drm));
if (!drm) {
wlr_log_errno(L_ERROR, "Allocation failed");
return NULL;
}
struct wlr_backend *backend = wlr_backend_create(&backend_impl, state);
struct wlr_backend *backend = wlr_backend_create(&backend_impl, drm);
if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
wlr_log_errno(L_ERROR, "Allocation failed");
return NULL;
}
state->backend = backend;
state->session = session;
state->udev = udev;
state->outputs = list_create();
if (!state->outputs) {
drm->base = backend;
drm->session = session;
drm->udev = udev;
drm->outputs = list_create();
if (!drm->outputs) {
wlr_log(L_ERROR, "Failed to allocate list");
goto error_backend;
}
state->fd = gpu_fd;
drm->fd = gpu_fd;
struct stat st;
if (fstat(state->fd, &st) < 0) {
wlr_log(L_ERROR, "Stat failed: %s", strerror(errno));
if (fstat(drm->fd, &st) < 0) {
wlr_log_errno(L_ERROR, "Stat failed");
}
state->dev = st.st_rdev;
drm->dev = st.st_rdev;
state->drm_invalidated.notify = drm_invalidated;
wlr_udev_signal_add(udev, state->dev, &state->drm_invalidated);
drm->drm_invalidated.notify = drm_invalidated;
wlr_udev_signal_add(udev, drm->dev, &drm->drm_invalidated);
state->display = display;
drm->display = display;
struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
state->drm_event = wl_event_loop_add_fd(event_loop, state->fd,
drm->drm_event = wl_event_loop_add_fd(event_loop, drm->fd,
WL_EVENT_READABLE, wlr_drm_event, NULL);
if (!state->drm_event) {
if (!drm->drm_event) {
wlr_log(L_ERROR, "Failed to create DRM event source");
goto error_fd;
}
state->session_signal.notify = session_signal;
wl_signal_add(&session->session_signal, &state->session_signal);
drm->session_signal.notify = session_signal;
wl_signal_add(&session->session_signal, &drm->session_signal);
// TODO: what is the difference between the per-output renderer and this
// one?
if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {
if (!wlr_drm_check_features(drm)) {
goto error_event;
}
if (!wlr_drm_resources_init(drm)) {
goto error_event;
}
if (!wlr_drm_renderer_init(&drm->renderer, drm->fd)) {
wlr_log(L_ERROR, "Failed to initialize renderer");
goto error_event;
}
@ -141,12 +144,12 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
return backend;
error_event:
wl_event_source_remove(state->drm_event);
wl_event_source_remove(drm->drm_event);
error_fd:
wlr_session_close_file(state->session, state->fd);
list_free(state->outputs);
wlr_session_close_file(drm->session, drm->fd);
list_free(drm->outputs);
error_backend:
free(state);
free(drm);
free(backend);
return NULL;
}

143
backend/drm/drm-properties.c Normal file
View file

@ -0,0 +1,143 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <wlr/util/log.h>
#include "backend/drm-properties.h"
/*
* Creates a mapping between property names and an array index where to store
* the ids. The prop_info arrays must be sorted by name, as bsearch is used to
* search them.
*/
struct prop_info {
const char *name;
size_t index;
};
static const struct prop_info connector_info[] = {
#define INDEX(name) (offsetof(union wlr_drm_connector_props, name) / sizeof(uint32_t))
{ "CRTC_ID", INDEX(crtc_id) },
{ "DPMS", INDEX(dpms) },
{ "EDID", INDEX(edid) },
#undef INDEX
};
static const struct prop_info crtc_info[] = {
#define INDEX(name) (offsetof(union wlr_drm_crtc_props, name) / sizeof(uint32_t))
{ "rotation", INDEX(rotation) },
{ "scaling mode", INDEX(scaling_mode) },
#undef INDEX
};
static const struct prop_info plane_info[] = {
#define INDEX(name) (offsetof(union wlr_drm_plane_props, name) / sizeof(uint32_t))
{ "CRTC_H", INDEX(crtc_h) },
{ "CRTC_ID", INDEX(crtc_id) },
{ "CRTC_W", INDEX(crtc_w) },
{ "CRTC_X", INDEX(crtc_x) },
{ "CRTC_Y", INDEX(crtc_y) },
{ "FB_ID", INDEX(fb_id) },
{ "SRC_H", INDEX(src_h) },
{ "SRC_W", INDEX(src_w) },
{ "SRC_X", INDEX(src_x) },
{ "SRC_Y", INDEX(src_y) },
{ "type", INDEX(type) },
#undef INDEX
};
static int cmp_prop_info(const void *arg1, const void *arg2) {
const char *key = arg1;
const struct prop_info *elem = arg2;
return strcmp(key, elem->name);
}
static bool scan_properties(int fd, uint32_t id, uint32_t type, uint32_t *result,
const struct prop_info *info, size_t info_len) {
drmModeObjectProperties *props = drmModeObjectGetProperties(fd, id, type);
if (!props) {
wlr_log_errno(L_ERROR, "Failed to get DRM object properties");
return false;
}
for (uint32_t i = 0; i < props->count_props; ++i) {
drmModePropertyRes *prop = drmModeGetProperty(fd, props->props[i]);
if (!prop) {
wlr_log_errno(L_ERROR, "Failed to get DRM object property");
continue;
}
const struct prop_info *p =
bsearch(prop->name, info, info_len, sizeof(info[0]), cmp_prop_info);
if (p) {
result[p->index] = prop->prop_id;
}
drmModeFreeProperty(prop);
}
drmModeFreeObjectProperties(props);
return true;
}
bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out) {
return scan_properties(fd, id, DRM_MODE_OBJECT_CONNECTOR, out->props,
connector_info, sizeof(connector_info) / sizeof(connector_info[0]));
}
bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out) {
return scan_properties(fd, id, DRM_MODE_OBJECT_CRTC, out->props,
crtc_info, sizeof(crtc_info) / sizeof(crtc_info[0]));
}
bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out) {
return scan_properties(fd, id, DRM_MODE_OBJECT_PLANE, out->props,
plane_info, sizeof(plane_info) / sizeof(plane_info[0]));
}
bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret) {
drmModeObjectProperties *props = drmModeObjectGetProperties(fd, obj, DRM_MODE_OBJECT_ANY);
if (!props) {
return false;
}
bool found = false;
for (uint32_t i = 0; i < props->count_props; ++i) {
if (props->props[i] == prop) {
*ret = props->prop_values[i];
found = true;
break;
}
}
drmModeFreeObjectProperties(props);
return found;
}
void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len) {
uint64_t blob_id;
if (!wlr_drm_get_prop(fd, obj, prop, &blob_id)) {
return NULL;
}
drmModePropertyBlobRes *blob = drmModeGetPropertyBlob(fd, blob_id);
if (!blob) {
return NULL;
}
void *ptr = malloc(blob->length);
if (!ptr) {
drmModeFreePropertyBlob(blob);
return NULL;
}
memcpy(ptr, blob->data, blob->length);
*ret_len = blob->length;
drmModeFreePropertyBlob(blob);
return ptr;
}

267
backend/drm/drm-util.c Normal file
View file

@ -0,0 +1,267 @@
#include <stdio.h>
#include <string.h>
#include <drm.h>
#include <drm_mode.h>
#include "backend/drm-util.h"
int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
mode->vtotal / 2) / mode->vtotal;
if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
refresh *= 2;
}
if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
refresh /= 2;
}
if (mode->vscan > 1) {
refresh /= mode->vscan;
}
return refresh;
}
// Constructed from http://edid.tv/manufacturer
static const char *get_manufacturer(uint16_t id) {
#define ID(a, b, c) ((a & 0x1f) << 10) | ((b & 0x1f) << 5) | (c & 0x1f)
switch (id) {
case ID('A', 'A', 'A'): return "Avolites Ltd";
case ID('A', 'C', 'I'): return "Ancor Communications Inc";
case ID('A', 'C', 'R'): return "Acer Technologies";
case ID('A', 'P', 'P'): return "Apple Computer Inc";
case ID('B', 'N', 'O'): return "Bang & Olufsen";
case ID('C', 'M', 'N'): return "Chimei Innolux Corporation";
case ID('C', 'M', 'O'): return "Chi Mei Optoelectronics corp.";
case ID('C', 'R', 'O'): return "Extraordinary Technologies PTY Limited";
case ID('D', 'E', 'L'): return "Dell Inc.";
case ID('D', 'O', 'N'): return "DENON, Ltd.";
case ID('E', 'N', 'C'): return "Eizo Nanao Corporation";
case ID('E', 'P', 'H'): return "Epiphan Systems Inc.";
case ID('F', 'U', 'S'): return "Fujitsu Siemens Computers GmbH";
case ID('G', 'S', 'M'): return "Goldstar Company Ltd";
case ID('H', 'I', 'Q'): return "Kaohsiung Opto Electronics Americas, Inc.";
case ID('H', 'S', 'D'): return "HannStar Display Corp";
case ID('H', 'W', 'P'): return "Hewlett Packard";
case ID('I', 'N', 'T'): return "Interphase Corporation";
case ID('I', 'V', 'M'): return "Iiyama North America";
case ID('L', 'E', 'N'): return "Lenovo Group Limited";
case ID('M', 'A', 'X'): return "Rogen Tech Distribution Inc";
case ID('M', 'E', 'G'): return "Abeam Tech Ltd";
case ID('M', 'E', 'I'): return "Panasonic Industry Company";
case ID('M', 'T', 'C'): return "Mars-Tech Corporation";
case ID('M', 'T', 'X'): return "Matrox";
case ID('N', 'E', 'C'): return "NEC Corporation";
case ID('O', 'N', 'K'): return "ONKYO Corporation";
case ID('O', 'R', 'N'): return "ORION ELECTRIC CO., LTD.";
case ID('O', 'T', 'M'): return "Optoma Corporation";
case ID('O', 'V', 'R'): return "Oculus VR, Inc.";
case ID('P', 'H', 'L'): return "Philips Consumer Electronics Company";
case ID('P', 'I', 'O'): return "Pioneer Electronic Corporation";
case ID('P', 'N', 'R'): return "Planar Systems, Inc.";
case ID('Q', 'D', 'S'): return "Quanta Display Inc.";
case ID('S', 'A', 'M'): return "Samsung Electric Company";
case ID('S', 'E', 'C'): return "Seiko Epson Corporation";
case ID('S', 'H', 'P'): return "Sharp Corporation";
case ID('S', 'I', 'I'): return "Silicon Image, Inc.";
case ID('S', 'N', 'Y'): return "Sony";
case ID('T', 'O', 'P'): return "Orion Communications Co., Ltd.";
case ID('T', 'S', 'B'): return "Toshiba America Info Systems Inc";
case ID('T', 'S', 'T'): return "Transtream Inc";
case ID('U', 'N', 'K'): return "Unknown";
case ID('V', 'I', 'Z'): return "VIZIO, Inc";
case ID('V', 'S', 'C'): return "ViewSonic Corporation";
case ID('Y', 'M', 'H'): return "Yamaha Corporation";
default: return "Unknown";
}
#undef ID
}
/* See https://en.wikipedia.org/wiki/Extended_Display_Identification_Data for layout of EDID data.
* We don't parse the EDID properly. We just expect to receive valid data.
*/
void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data) {
if (!data || len < 128) {
snprintf(output->make, sizeof(output->make), "<Unknown>");
snprintf(output->model, sizeof(output->model), "<Unknown>");
return;
}
uint16_t id = (data[8] << 8) | data[9];
snprintf(output->make, sizeof(output->make), "%s", get_manufacturer(id));
output->phys_width = ((data[68] & 0xf0) << 4) | data[66];
output->phys_height = ((data[68] & 0x0f) << 8) | data[67];
for (size_t i = 72; i <= 108; i += 18) {
uint16_t flag = (data[i] << 8) | data[i + 1];
if (flag == 0 && data[i + 3] == 0xFC) {
sprintf(output->model, "%.13s", &data[i + 5]);
// Monitor names are terminated by newline if they're too short
char *nl = strchr(output->model, '\n');
if (nl) {
*nl = '\0';
}
break;
}
}
}
const char *conn_get_name(uint32_t type_id) {
switch (type_id) {
case DRM_MODE_CONNECTOR_Unknown: return "Unknown";
case DRM_MODE_CONNECTOR_VGA: return "VGA";
case DRM_MODE_CONNECTOR_DVII: return "DVI-I";
case DRM_MODE_CONNECTOR_DVID: return "DVI-D";
case DRM_MODE_CONNECTOR_DVIA: return "DVI-A";
case DRM_MODE_CONNECTOR_Composite: return "Composite";
case DRM_MODE_CONNECTOR_SVIDEO: return "SVIDEO";
case DRM_MODE_CONNECTOR_LVDS: return "LVDS";
case DRM_MODE_CONNECTOR_Component: return "Component";
case DRM_MODE_CONNECTOR_9PinDIN: return "DIN";
case DRM_MODE_CONNECTOR_DisplayPort: return "DP";
case DRM_MODE_CONNECTOR_HDMIA: return "HDMI-A";
case DRM_MODE_CONNECTOR_HDMIB: return "HDMI-B";
case DRM_MODE_CONNECTOR_TV: return "TV";
case DRM_MODE_CONNECTOR_eDP: return "eDP";
case DRM_MODE_CONNECTOR_VIRTUAL: return "Virtual";
case DRM_MODE_CONNECTOR_DSI: return "DSI";
default: return "Unknown";
}
}
static inline bool is_taken(size_t n, const uint32_t arr[static n], uint32_t key) {
for (size_t i = 0; i < n; ++i) {
if (arr[i] == key) {
return true;
}
}
return false;
}
/*
* Store all of the non-recursive state in a struct, so we aren't literally
* passing 12 arguments to a function.
*/
struct match_state {
const size_t num_objs;
const uint32_t *restrict objs;
const size_t num_res;
size_t score;
size_t replaced;
uint32_t *restrict res;
uint32_t *restrict best;
const uint32_t *restrict orig;
bool exit_early;
};
/*
* skips: The number of SKIP elements encountered so far.
* score: The number of resources we've matched so far.
* replaced: The number of changes from the original solution.
* i: The index of the current element.
*
* This tries to match a solution as close to st->orig as it can.
*
* Returns whether we've set a new best element with this solution.
*/
static bool match_obj_(struct match_state *st, size_t skips, size_t score, size_t replaced, size_t i) {
// Finished
if (i >= st->num_res) {
if (score > st->score || (score == st->score && replaced < st->replaced)) {
st->score = score;
st->replaced = replaced;
memcpy(st->best, st->res, sizeof st->best[0] * st->num_res);
if (st->score == st->num_objs && st->replaced == 0) {
st->exit_early = true;
}
st->exit_early = (st->score == st->num_res - skips
|| st->score == st->num_objs)
&& st->replaced == 0;
return true;
} else {
return false;
}
}
if (st->orig[i] == SKIP) {
st->res[i] = SKIP;
return match_obj_(st, skips + 1, score, replaced, i + 1);
}
/*
* Attempt to use the current solution first, to try and avoid
* recalculating everything
*/
if (st->orig[i] != UNMATCHED && !is_taken(i, st->res, st->orig[i])) {
st->res[i] = st->orig[i];
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
return true;
}
}
if (st->orig[i] != UNMATCHED) {
++replaced;
}
bool is_best = false;
for (st->res[i] = 0; st->res[i] < st->num_objs; ++st->res[i]) {
// We tried this earlier
if (st->res[i] == st->orig[i]) {
continue;
}
// Not compatable
if (!(st->objs[st->res[i]] & (1 << i))) {
continue;
}
// Already taken
if (is_taken(i, st->res, st->res[i])) {
continue;
}
if (match_obj_(st, skips, score + 1, replaced, i + 1)) {
is_best = true;
}
if (st->exit_early) {
return true;
}
}
if (is_best) {
return true;
}
// Maybe this resource can't be matched
st->res[i] = UNMATCHED;
return match_obj_(st, skips, score, replaced, i + 1);
}
size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
size_t num_res, const uint32_t res[static restrict num_res],
uint32_t out[static restrict num_res]) {
uint32_t solution[num_res];
struct match_state st = {
.num_objs = num_objs,
.num_res = num_res,
.score = 0,
.replaced = SIZE_MAX,
.objs = objs,
.res = solution,
.best = out,
.orig = res,
.exit_early = false,
};
match_obj_(&st, 0, 0, 0, 0);
return st.score;
}

1069
backend/drm/drm.c
View file

File diff suppressed because it is too large Load diff

2
backend/egl.c
View file

@ -99,7 +99,7 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out, EGLenum platform) {
continue;
}
if (gbm_format == GBM_FORMAT_XRGB8888) {
if (gbm_format == GBM_FORMAT_ARGB8888) {
*out = configs[i];
return true;
}

2
backend/meson.build
View file

@ -7,6 +7,8 @@ wlr_files += files(
'session/session.c',
'drm/backend.c',
'drm/drm.c',
'drm/drm-properties.c',
'drm/drm-util.c',
'libinput/backend.c',
'libinput/events.c',
'libinput/keyboard.c',

2
examples/shared.c
View file

@ -9,7 +9,7 @@
#include <wayland-server-protocol.h>
#include <wlr/backend.h>
#include <wlr/backend/session.h>
#include <wlr/backend/multi.h>
#include <wlr/backend/multi.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/log.h>

62
include/backend/drm-properties.h Normal file
View file

@ -0,0 +1,62 @@
#ifndef DRM_PROPERTIES_H
#define DRM_PROPERTIES_H
#include <stdbool.h>
#include <stdint.h>
/*
* These types contain the property ids for several DRM objects.
* See https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-kms.html#kms-properties
* for more details.
*/
union wlr_drm_connector_props {
struct {
uint32_t edid;
uint32_t dpms;
// atomic-modesetting only
uint32_t crtc_id;
};
uint32_t props[3];
};
union wlr_drm_crtc_props {
struct {
// Neither of these are guranteed to exist
uint32_t rotation;
uint32_t scaling_mode;
};
uint32_t props[2];
};
union wlr_drm_plane_props {
struct {
uint32_t type;
uint32_t rotation; // Not guranteed to exist
// atomic-modesetting only
uint32_t src_x;
uint32_t src_y;
uint32_t src_w;
uint32_t src_h;
uint32_t crtc_x;
uint32_t crtc_y;
uint32_t crtc_w;
uint32_t crtc_h;
uint32_t fb_id;
uint32_t crtc_id;
};
uint32_t props[12];
};
bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out);
bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
#endif

37
include/backend/drm-util.h Normal file
View file

@ -0,0 +1,37 @@
#ifndef WLR_DRM_UTIL_H
#define WLR_DRM_UTIL_H
#include <stdint.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <wlr/types/wlr_output.h>
// Calculates a more accurate refresh rate (mHz) than what mode itself provides
int32_t calculate_refresh_rate(drmModeModeInfo *mode);
// Populates the make/model/phys_{width,height} of output from the edid data
void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data);
// Returns the string representation of a DRM output type
const char *conn_get_name(uint32_t type_id);
// Part of match_obj
enum {
UNMATCHED = (uint32_t)-1,
SKIP = (uint32_t)-2,
};
/*
* Tries to match some DRM objects with some other DRM resource.
* e.g. Match CRTCs with Encoders, CRTCs with Planes.
*
* objs contains a bit array which resources it can be matched with.
* e.g. Bit 0 set means can be matched with res[0]
*
* res contains an index of which objs it is matched with or UNMATCHED.
*
* This solution is left in out.
* Returns the total number of matched solutions.
*/
size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
size_t num_res, const uint32_t res[static restrict num_res],
uint32_t out[static restrict num_res]);
#endif

108
include/backend/drm.h
View file

@ -14,8 +14,58 @@
#include <wlr/backend/drm.h>
#include <wlr/util/list.h>
#include "backend/egl.h"
#include "backend/udev.h"
#include <backend/egl.h>
#include <backend/udev.h>
#include "drm-properties.h"
struct wlr_drm_plane {
uint32_t type;
uint32_t id;
uint32_t possible_crtcs;
uint32_t width, height;
struct gbm_surface *gbm;
EGLSurface egl;
struct gbm_bo *front;
struct gbm_bo *back;
// Only used by cursor
float matrix[16];
struct wlr_renderer *wlr_rend;
struct wlr_surface *wlr_surf;
struct gbm_bo *cursor_bo;
union wlr_drm_plane_props props;
};
struct wlr_drm_crtc {
uint32_t id;
union {
struct {
struct wlr_drm_plane *overlay;
struct wlr_drm_plane *primary;
struct wlr_drm_plane *cursor;
};
struct wlr_drm_plane *planes[3];
};
union wlr_drm_crtc_props props;
struct wl_list connectors;
};
struct wlr_drm_connector {
struct wlr_output *base;
uint32_t id;
struct wlr_drm_crtc *crtc;
union wlr_drm_connector_props props;
struct wl_list link;
};
struct wlr_drm_renderer {
int fd;
@ -27,10 +77,34 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd);
void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer);
struct wlr_backend_state {
struct wlr_backend *base;
int fd;
dev_t dev;
struct wlr_backend *backend;
size_t num_crtcs;
struct wlr_drm_crtc *crtcs;
size_t num_planes;
struct wlr_drm_plane *planes;
union {
struct {
size_t num_overlay_planes;
size_t num_primary_planes;
size_t num_cursor_planes;
};
size_t num_type_planes[3];
};
union {
struct {
struct wlr_drm_plane *overlay_planes;
struct wlr_drm_plane *primary_planes;
struct wlr_drm_plane *cursor_planes;
};
struct wlr_drm_plane *type_planes[3];
};
struct wl_display *display;
struct wl_event_source *drm_event;
@ -46,9 +120,9 @@ struct wlr_backend_state {
};
enum wlr_drm_output_state {
DRM_OUTPUT_DISCONNECTED,
DRM_OUTPUT_NEEDS_MODESET,
DRM_OUTPUT_CONNECTED,
WLR_DRM_OUTPUT_DISCONNECTED,
WLR_DRM_OUTPUT_NEEDS_MODESET,
WLR_DRM_OUTPUT_CONNECTED,
};
struct wlr_output_mode_state {
@ -57,38 +131,34 @@ struct wlr_output_mode_state {
};
struct wlr_output_state {
struct wlr_output *wlr_output;
struct wlr_output *base;
enum wlr_drm_output_state state;
uint32_t connector;
struct {
uint32_t dpms;
} props;
struct wlr_drm_crtc *crtc;
uint32_t possible_crtc;
union wlr_drm_connector_props props;
uint32_t width;
uint32_t height;
uint32_t crtc;
drmModeCrtc *old_crtc;
struct wlr_drm_renderer *renderer;
EGLSurface *egl;
struct gbm_surface *gbm;
struct gbm_bo *bo[2];
struct gbm_bo *cursor_bo[2];
int current_cursor;
uint32_t cursor_width, cursor_height;
bool pageflip_pending;
bool cleanup;
};
bool wlr_drm_check_features(struct wlr_backend_state *drm);
bool wlr_drm_resources_init(struct wlr_backend_state *drm);
void wlr_drm_resources_free(struct wlr_backend_state *drm);
void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data);
void wlr_drm_output_start_renderer(struct wlr_output_state *output);
void wlr_drm_output_pause_renderer(struct wlr_output_state *output);
bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc);
#endif

6
include/wlr/render/matrix.h
View file

@ -1,10 +1,16 @@
#ifndef _WLR_RENDER_MATRIX_H
#define _WLR_RENDER_MATRIX_H
#include <stdint.h>
void wlr_matrix_identity(float (*output)[16]);
void wlr_matrix_translate(float (*output)[16], float x, float y, float z);
void wlr_matrix_scale(float (*output)[16], float x, float y, float z);
void wlr_matrix_rotate(float (*output)[16], float radians);
void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)[16]);
enum wl_output_transform;
void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
enum wl_output_transform transform);
#endif

60
render/matrix.c
View file

@ -1,5 +1,6 @@
#include <string.h>
#include <math.h>
#include <wayland-server-protocol.h>
#include <wlr/render/matrix.h>
/* Obtains the index for the given row/column */
@ -81,3 +82,62 @@ void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)
};
memcpy(*product, _product, sizeof(_product));
}
static const float transforms[][4] = {
[WL_OUTPUT_TRANSFORM_NORMAL] = {
1.0f, 0.0f,
0.0f, -1.0f,
},
[WL_OUTPUT_TRANSFORM_90] = {
0.0f, -1.0f,
-1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_180] = {
-1.0f, 0.0f,
0.0f, 1.0f,
},
[WL_OUTPUT_TRANSFORM_270] = {
0.0f, 1.0f,
1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED] = {
-1.0f, 0.0f,
0.0f, -1.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_90] = {
0.0f, 1.0f,
-1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_180] = {
1.0f, 0.0f,
0.0f, 1.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_270] = {
0.0f, -1.0f,
1.0f, 0.0f,
},
};
// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
enum wl_output_transform transform) {
memset(mat, 0, sizeof(*mat) * 16);
const float *t = transforms[transform];
float x = 2.0f / width;
float y = 2.0f / height;
// Rotation + relection
mat[0] = x * t[0];
mat[1] = x * t[1];
mat[4] = y * t[2];
mat[5] = y * t[3];
// Translation
mat[3] = -copysign(1.0f, mat[0] + mat[1]);
mat[7] = -copysign(1.0f, mat[4] + mat[5]);
// Identity
mat[10] = 1.0f;
mat[15] = 1.0f;
}

63
types/wlr_output.c
View file

@ -88,67 +88,8 @@ struct wl_global *wlr_output_create_global(
return wl_global;
}
static const float transforms[][4] = {
[WL_OUTPUT_TRANSFORM_NORMAL] = {
1.0f, 0.0f,
0.0f, -1.0f,
},
[WL_OUTPUT_TRANSFORM_90] = {
0.0f, -1.0f,
-1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_180] = {
-1.0f, 0.0f,
0.0f, 1.0f,
},
[WL_OUTPUT_TRANSFORM_270] = {
0.0f, 1.0f,
1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED] = {
-1.0f, 0.0f,
0.0f, -1.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_90] = {
0.0f, 1.0f,
-1.0f, 0.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_180] = {
1.0f, 0.0f,
0.0f, 1.0f,
},
[WL_OUTPUT_TRANSFORM_FLIPPED_270] = {
0.0f, -1.0f,
1.0f, 0.0f,
},
};
// Equivilent to glOrtho(0, width, 0, height, 1, -1) with the transform applied
static void set_matrix(float mat[static 16], int32_t width, int32_t height,
enum wl_output_transform transform) {
memset(mat, 0, sizeof(*mat) * 16);
const float *t = transforms[transform];
float x = 2.0f / width;
float y = 2.0f / height;
// Rotation + relection
mat[0] = x * t[0];
mat[1] = x * t[1];
mat[4] = y * t[2];
mat[5] = y * t[3];
// Translation
mat[3] = -copysign(1.0f, mat[0] + mat[1]);
mat[7] = -copysign(1.0f, mat[4] + mat[5]);
// Identity
mat[10] = 1.0f;
mat[15] = 1.0f;
}
void wlr_output_update_matrix(struct wlr_output *output) {
set_matrix(output->transform_matrix, output->width, output->height, output->transform);
wlr_matrix_surface(output->transform_matrix, output->width, output->height, output->transform);
}
struct wlr_output *wlr_output_create(struct wlr_output_impl *impl,
@ -206,7 +147,7 @@ bool wlr_output_set_cursor(struct wlr_output *output,
output->cursor.texture = wlr_render_surface_init(output->cursor.renderer);
}
wlr_surface_attach_pixels(output->cursor.texture, WL_SHM_FORMAT_ABGR8888,
wlr_surface_attach_pixels(output->cursor.texture, WL_SHM_FORMAT_ARGB8888,
stride, width, height, buf);
return true;