hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename wlr_drm_output to wlr_drm_connector

This commit is contained in:
Scott Anderson 2017-09-30 23:31:08 +13:00
parent 22e77d9195
commit 4101b89700
6 changed files with 252 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/drm/backend.c
View File

@ -30,8 +30,8 @@ static void wlr_drm_backend_destroy(struct wlr_backend *backend) {
wlr_drm_restore_outputs(drm); wlr_drm_restore_outputs(drm);
for (size_t i = 0; drm->outputs && i < drm->outputs->length; ++i) { for (size_t i = 0; drm->outputs && i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
wlr_output_destroy(&output->output); wlr_output_destroy(&conn->output);
} }
wlr_drm_renderer_finish(&drm->renderer); wlr_drm_renderer_finish(&drm->renderer);
@ -65,15 +65,15 @@ static void session_signal(struct wl_listener *listener, void *data) {
wlr_log(L_INFO, "DRM fd resumed"); wlr_log(L_INFO, "DRM fd resumed");
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
wlr_drm_output_start_renderer(output); wlr_drm_connector_start_renderer(conn);
if (!output->crtc) { if (!conn->crtc) {
continue; continue;
} }
struct wlr_drm_plane *plane = output->crtc->cursor; struct wlr_drm_plane *plane = conn->crtc->cursor;
drm->iface->crtc_set_cursor(drm, output->crtc, drm->iface->crtc_set_cursor(drm, conn->crtc,
plane ? plane->cursor_bo : NULL); plane ? plane->cursor_bo : NULL);
} }
} else { } else {

422
backend/drm/drm.c
View File

@ -173,77 +173,73 @@ void wlr_drm_resources_free(struct wlr_drm_backend *drm) {
free(drm->planes); free(drm->planes);
} }
static void wlr_drm_output_make_current(struct wlr_output *_output) { static void wlr_drm_connector_make_current(struct wlr_output *output) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
wlr_drm_surface_make_current(&output->drm->renderer, &output->crtc->primary->surf); wlr_drm_surface_make_current(&conn->drm->renderer, &conn->crtc->primary->surf);
} }
static void wlr_drm_output_swap_buffers(struct wlr_output *_output) { static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
struct wlr_drm_crtc *crtc = output->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_plane *plane = crtc->primary; struct wlr_drm_plane *plane = crtc->primary;
struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&drm->renderer, &plane->surf); struct gbm_bo *bo = wlr_drm_surface_swap_buffers(&drm->renderer, &plane->surf);
uint32_t fb_id = get_fb_for_bo(bo); uint32_t fb_id = get_fb_for_bo(bo);
if (drm->iface->crtc_pageflip(drm, output, crtc, fb_id, NULL)) { if (drm->iface->crtc_pageflip(drm, conn, crtc, fb_id, NULL)) {
output->pageflip_pending = true; conn->pageflip_pending = true;
} else { } else {
wl_event_source_timer_update(output->retry_pageflip, wl_event_source_timer_update(conn->retry_pageflip,
1000.0f / output->output.current_mode->refresh); 1000.0f / conn->output.current_mode->refresh);
} }
} }
static void wlr_drm_output_set_gamma(struct wlr_output *_output, static void wlr_drm_connector_set_gamma(struct wlr_output *output,
uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b) { uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
drmModeCrtcSetGamma(output->drm->fd, output->crtc->id, size, r, g, b); drmModeCrtcSetGamma(conn->drm->fd, conn->crtc->id, size, r, g, b);
} }
static uint16_t wlr_drm_output_get_gamma_size(struct wlr_output *_output) { static uint16_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
drmModeCrtc *crtc = output->old_crtc; drmModeCrtc *crtc = conn->old_crtc;
if (!crtc) { return crtc ? crtc->gamma_size : 0;
return 0;
}
return crtc->gamma_size;
} }
void wlr_drm_output_start_renderer(struct wlr_drm_output *output) { void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn) {
if (output->state != WLR_DRM_OUTPUT_CONNECTED) { if (conn->state != WLR_DRM_CONN_CONNECTED) {
return; return;
} }
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
struct wlr_drm_crtc *crtc = output->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_plane *plane = crtc->primary; struct wlr_drm_plane *plane = crtc->primary;
struct gbm_bo *bo = wlr_drm_surface_get_front(&drm->renderer, &plane->surf); struct gbm_bo *bo = wlr_drm_surface_get_front(&drm->renderer, &plane->surf);
uint32_t fb_id = get_fb_for_bo(bo);
struct wlr_drm_output_mode *_mode = struct wlr_drm_mode *mode = (struct wlr_drm_mode *)conn->output.current_mode;
(struct wlr_drm_output_mode *)output->output.current_mode; if (drm->iface->crtc_pageflip(drm, conn, crtc, fb_id, &mode->drm_mode)) {
drmModeModeInfo *mode = &_mode->mode; conn->pageflip_pending = true;
if (drm->iface->crtc_pageflip(drm, output, crtc, get_fb_for_bo(bo), mode)) {
output->pageflip_pending = true;
} else { } else {
wl_event_source_timer_update(output->retry_pageflip, wl_event_source_timer_update(conn->retry_pageflip,
1000.0f / output->output.current_mode->refresh); 1000.0f / conn->output.current_mode->refresh);
} }
} }
static void wlr_drm_output_enable(struct wlr_output *_output, bool enable) { static void wlr_drm_connector_enable(struct wlr_output *output, bool enable) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
if (output->state != WLR_DRM_OUTPUT_CONNECTED) { if (conn->state != WLR_DRM_CONN_CONNECTED) {
return; return;
} }
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
drm->iface->conn_enable(drm, output, enable); drm->iface->conn_enable(drm, conn, enable);
if (enable) { if (enable) {
wlr_drm_output_start_renderer(output); wlr_drm_connector_start_renderer(conn);
} }
} }
@ -296,7 +292,7 @@ static void realloc_planes(struct wlr_drm_backend *drm, const uint32_t *crtc_in)
} }
} }
static void realloc_crtcs(struct wlr_drm_backend *drm, struct wlr_drm_output *output) { static void realloc_crtcs(struct wlr_drm_backend *drm, struct wlr_drm_connector *conn) {
uint32_t crtc[drm->num_crtcs]; uint32_t crtc[drm->num_crtcs];
uint32_t crtc_res[drm->num_crtcs]; uint32_t crtc_res[drm->num_crtcs];
uint32_t possible_crtc[drm->outputs->length]; uint32_t possible_crtc[drm->outputs->length];
@ -309,23 +305,23 @@ static void realloc_crtcs(struct wlr_drm_backend *drm, struct wlr_drm_output *ou
ssize_t index = -1; ssize_t index = -1;
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *o = drm->outputs->items[i]; struct wlr_drm_connector *c = drm->outputs->items[i];
if (o == output) { if (c == conn) {
index = i; index = i;
} }
if (o->state != WLR_DRM_OUTPUT_CONNECTED) { if (c->state != WLR_DRM_CONN_CONNECTED) {
continue; continue;
} }
possible_crtc[i] = o->possible_crtc; possible_crtc[i] = c->possible_crtc;
crtc[o->crtc - drm->crtcs] = i; crtc[c->crtc - drm->crtcs] = i;
} }
assert(index != -1); assert(index != -1);
possible_crtc[index] = output->possible_crtc; possible_crtc[index] = conn->possible_crtc;
match_obj(drm->outputs->length, possible_crtc, match_obj(drm->outputs->length, possible_crtc, drm->num_crtcs,
drm->num_crtcs, crtc, crtc_res); crtc, crtc_res);
bool matched = false; bool matched = false;
for (size_t i = 0; i < drm->num_crtcs; ++i) { for (size_t i = 0; i < drm->num_crtcs; ++i) {
@ -349,36 +345,29 @@ static void realloc_crtcs(struct wlr_drm_backend *drm, struct wlr_drm_output *ou
} }
if (crtc_res[i] != crtc[i]) { if (crtc_res[i] != crtc[i]) {
struct wlr_drm_output *o = drm->outputs->items[crtc_res[i]]; struct wlr_drm_connector *c = drm->outputs->items[crtc_res[i]];
o->crtc = &drm->crtcs[i]; c->crtc = &drm->crtcs[i];
} }
} }
realloc_planes(drm, crtc_res); realloc_planes(drm, crtc_res);
} }
static bool wlr_drm_output_set_mode(struct wlr_output *_output, static uint32_t get_possible_crtcs(int fd, uint32_t conn_id) {
struct wlr_output_mode *mode) { drmModeConnector *conn = drmModeGetConnector(fd, conn_id);
struct wlr_drm_output *output = (struct wlr_drm_output *)_output;
struct wlr_drm_backend *drm = output->drm;
wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", output->output.name,
mode->width, mode->height, mode->refresh);
drmModeConnector *conn = drmModeGetConnector(drm->fd, output->connector);
if (!conn) { if (!conn) {
wlr_log_errno(L_ERROR, "Failed to get DRM connector"); wlr_log_errno(L_ERROR, "Failed to get DRM connector");
goto error_output; return 0;
} }
if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) { if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
wlr_log(L_ERROR, "%s is not connected", output->output.name); wlr_log(L_ERROR, "Output is not connected");
goto error_output; goto error_conn;
} }
drmModeEncoder *enc = NULL; drmModeEncoder *enc = NULL;
for (int i = 0; !enc && i < conn->count_encoders; ++i) { for (int i = 0; !enc && i < conn->count_encoders; ++i) {
enc = drmModeGetEncoder(drm->fd, conn->encoders[i]); enc = drmModeGetEncoder(fd, conn->encoders[i]);
} }
if (!enc) { if (!enc) {
@ -386,35 +375,58 @@ static bool wlr_drm_output_set_mode(struct wlr_output *_output,
goto error_conn; goto error_conn;
} }
output->possible_crtc = enc->possible_crtcs; uint32_t ret = enc->possible_crtcs;
realloc_crtcs(drm, output); drmModeFreeEncoder(enc);
drmModeFreeConnector(conn);
return ret;
if (!output->crtc) { error_conn:
wlr_log(L_ERROR, "Unable to match %s with a CRTC", output->output.name); drmModeFreeConnector(conn);
goto error_enc; return 0;
}
static bool wlr_drm_connector_set_mode(struct wlr_output *output,
struct wlr_output_mode *mode) {
struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = conn->drm;
wlr_log(L_INFO, "Modesetting '%s' with '%ux%u@%u mHz'", conn->output.name,
mode->width, mode->height, mode->refresh);
wlr_log(L_DEBUG, "%p %p", conn, drm);
conn->possible_crtc = get_possible_crtcs(drm->fd, conn->id);
if (conn->possible_crtc == 0) {
goto error_conn;
} }
struct wlr_drm_crtc *crtc = output->crtc; realloc_crtcs(drm, conn);
wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", output->output.name,
if (!conn->crtc) {
wlr_log(L_ERROR, "Unable to match %s with a CRTC", conn->output.name);
goto error_conn;
}
struct wlr_drm_crtc *crtc = conn->crtc;
wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name,
crtc - drm->crtcs, crtc - drm->crtcs,
crtc->overlay ? crtc->overlay - drm->overlay_planes : -1, crtc->overlay ? crtc->overlay - drm->overlay_planes : -1,
crtc->primary ? crtc->primary - drm->primary_planes : -1, crtc->primary ? crtc->primary - drm->primary_planes : -1,
crtc->cursor ? crtc->cursor - drm->cursor_planes : -1); crtc->cursor ? crtc->cursor - drm->cursor_planes : -1);
output->state = WLR_DRM_OUTPUT_CONNECTED; conn->state = WLR_DRM_CONN_CONNECTED;
output->width = output->output.width = mode->width; conn->output.width = mode->width;
output->height = output->output.height = mode->height; conn->output.height = mode->height;
output->output.current_mode = mode; conn->output.current_mode = mode;
wl_signal_emit(&output->output.events.resolution, &output->output); wl_signal_emit(&conn->output.events.resolution, &conn->output);
// Since realloc_crtcs can deallocate planes on OTHER outputs, // Since realloc_crtcs can deallocate planes on OTHER outputs,
// we actually need to reinitalise all of them // we actually need to reinitalise all of them
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
struct wlr_output_mode *mode = output->output.current_mode; struct wlr_output_mode *mode = conn->output.current_mode;
struct wlr_drm_crtc *crtc = output->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
if (output->state != WLR_DRM_OUTPUT_CONNECTED) { if (conn->state != WLR_DRM_CONN_CONNECTED) {
continue; continue;
} }
@ -422,36 +434,31 @@ static bool wlr_drm_output_set_mode(struct wlr_output *_output,
mode->width, mode->height, GBM_FORMAT_XRGB8888, mode->width, mode->height, GBM_FORMAT_XRGB8888,
GBM_BO_USE_SCANOUT)) { GBM_BO_USE_SCANOUT)) {
wlr_log(L_ERROR, "Failed to initalise renderer for plane"); wlr_log(L_ERROR, "Failed to initalise renderer for plane");
goto error_enc; goto error_conn;
} }
wlr_drm_output_start_renderer(output); wlr_drm_connector_start_renderer(conn);
} }
drmModeFreeEncoder(enc);
drmModeFreeConnector(conn);
return true; return true;
error_enc:
drmModeFreeEncoder(enc);
error_conn: error_conn:
drmModeFreeConnector(conn); wlr_drm_connector_cleanup(conn);
error_output:
wlr_drm_output_cleanup(output);
return false; return false;
} }
static void wlr_drm_output_transform(struct wlr_output *output, static void wlr_drm_connector_transform(struct wlr_output *output,
enum wl_output_transform transform) { enum wl_output_transform transform) {
output->transform = transform; output->transform = transform;
} }
static bool wlr_drm_output_set_cursor(struct wlr_output *_output, static bool wlr_drm_connector_set_cursor(struct wlr_output *output,
const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) { const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
struct wlr_drm_renderer *renderer = &drm->renderer; struct wlr_drm_renderer *renderer = &drm->renderer;
struct wlr_drm_crtc *crtc = output->crtc;
struct wlr_drm_crtc *crtc = conn->crtc;
struct wlr_drm_plane *plane = crtc->cursor; struct wlr_drm_plane *plane = crtc->cursor;
if (!buf) { if (!buf) {
@ -496,7 +503,7 @@ static bool wlr_drm_output_set_cursor(struct wlr_output *_output,
// OpenGL will read the pixels out upside down, // OpenGL will read the pixels out upside down,
// so we need to flip the image vertically // so we need to flip the image vertically
wlr_matrix_texture(plane->matrix, plane->surf.width, plane->surf.height, wlr_matrix_texture(plane->matrix, plane->surf.width, plane->surf.height,
output->output.transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180); conn->output.transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180);
// TODO the image needs to be rotated depending on the output rotation // TODO the image needs to be rotated depending on the output rotation
@ -548,15 +555,15 @@ static bool wlr_drm_output_set_cursor(struct wlr_output *_output,
return drm->iface->crtc_set_cursor(drm, crtc, bo); return drm->iface->crtc_set_cursor(drm, crtc, bo);
} }
static bool wlr_drm_output_move_cursor(struct wlr_output *_output, static bool wlr_drm_connector_move_cursor(struct wlr_output *output,
int x, int y) { int x, int y) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
int width, height, tmp; int width, height, tmp;
wlr_output_effective_resolution(_output, &width, &height); wlr_output_effective_resolution(output, &width, &height);
switch (_output->transform) { switch (output->transform) {
case WL_OUTPUT_TRANSFORM_NORMAL: case WL_OUTPUT_TRANSFORM_NORMAL:
// nothing to do // nothing to do
break; break;
@ -573,51 +580,45 @@ static bool wlr_drm_output_move_cursor(struct wlr_output *_output,
default: default:
// TODO other transformations // TODO other transformations
wlr_log(L_ERROR, "TODO: handle surface to crtc for transformation = %d", wlr_log(L_ERROR, "TODO: handle surface to crtc for transformation = %d",
_output->transform); output->transform);
break; break;
} }
return drm->iface->crtc_move_cursor(drm, output->crtc, x, y); return drm->iface->crtc_move_cursor(drm, conn->crtc, x, y);
} }
static void wlr_drm_output_destroy(struct wlr_output *_output) { static void wlr_drm_connector_destroy(struct wlr_output *output) {
struct wlr_drm_output *output = (struct wlr_drm_output *)_output; struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
wlr_drm_output_cleanup(output); wlr_drm_connector_cleanup(conn);
wl_event_source_remove(output->retry_pageflip); wl_event_source_remove(conn->retry_pageflip);
free(output); free(conn);
} }
static struct wlr_output_impl output_impl = { static struct wlr_output_impl output_impl = {
.enable = wlr_drm_output_enable, .enable = wlr_drm_connector_enable,
.set_mode = wlr_drm_output_set_mode, .set_mode = wlr_drm_connector_set_mode,
.transform = wlr_drm_output_transform, .transform = wlr_drm_connector_transform,
.set_cursor = wlr_drm_output_set_cursor, .set_cursor = wlr_drm_connector_set_cursor,
.move_cursor = wlr_drm_output_move_cursor, .move_cursor = wlr_drm_connector_move_cursor,
.destroy = wlr_drm_output_destroy, .destroy = wlr_drm_connector_destroy,
.make_current = wlr_drm_output_make_current, .make_current = wlr_drm_connector_make_current,
.swap_buffers = wlr_drm_output_swap_buffers, .swap_buffers = wlr_drm_connector_swap_buffers,
.set_gamma = wlr_drm_output_set_gamma, .set_gamma = wlr_drm_connector_set_gamma,
.get_gamma_size = wlr_drm_output_get_gamma_size, .get_gamma_size = wlr_drm_connector_get_gamma_size,
}; };
static int retry_pageflip(void *data) { static int retry_pageflip(void *data) {
struct wlr_drm_output *output = data; struct wlr_drm_connector *conn = data;
wlr_log(L_INFO, "%s: Retrying pageflip", output->output.name); wlr_log(L_INFO, "%s: Retrying pageflip", conn->output.name);
wlr_drm_output_start_renderer(output); wlr_drm_connector_start_renderer(conn);
return 0; return 0;
} }
static int find_id(const void *item, const void *cmp_to) { static int find_id(const void *item, const void *cmp_to) {
const struct wlr_drm_output *output = item; const struct wlr_drm_connector *conn = item;
const uint32_t *id = cmp_to; const uint32_t *id = cmp_to;
if (output->connector < *id) { return (int)conn->id - (int)*id;
return -1;
} else if (output->connector > *id) {
return 1;
} else {
return 0;
}
} }
static const int32_t subpixel_map[] = { static const int32_t subpixel_map[] = {
@ -644,110 +645,111 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
memset(seen, 0, sizeof(seen)); memset(seen, 0, sizeof(seen));
for (int i = 0; i < res->count_connectors; ++i) { for (int i = 0; i < res->count_connectors; ++i) {
drmModeConnector *conn = drmModeGetConnector(drm->fd, drmModeConnector *drm_conn = drmModeGetConnector(drm->fd,
res->connectors[i]); res->connectors[i]);
if (!conn) { if (!drm_conn) {
wlr_log_errno(L_ERROR, "Failed to get DRM connector"); wlr_log_errno(L_ERROR, "Failed to get DRM connector");
continue; continue;
} }
struct wlr_drm_output *output; struct wlr_drm_connector *wlr_conn;
int index = list_seq_find(drm->outputs, find_id, &conn->connector_id); int index = list_seq_find(drm->outputs, find_id, &drm_conn->connector_id);
if (index == -1) { if (index == -1) {
output = calloc(1, sizeof(*output)); wlr_conn = calloc(1, sizeof(*wlr_conn));
if (!output) { if (!wlr_conn) {
wlr_log_errno(L_ERROR, "Allocation failed"); wlr_log_errno(L_ERROR, "Allocation failed");
drmModeFreeConnector(conn); drmModeFreeConnector(drm_conn);
continue; continue;
} }
wlr_output_init(&output->output, &output_impl); wlr_output_init(&wlr_conn->output, &output_impl);
struct wl_event_loop *ev = wl_display_get_event_loop(drm->display); struct wl_event_loop *ev = wl_display_get_event_loop(drm->display);
output->retry_pageflip = wl_event_loop_add_timer(ev, retry_pageflip, wlr_conn->retry_pageflip = wl_event_loop_add_timer(ev, retry_pageflip,
output); wlr_conn);
output->state = WLR_DRM_OUTPUT_DISCONNECTED; wlr_conn->drm = drm;
output->connector = conn->connector_id; wlr_conn->state = WLR_DRM_CONN_DISCONNECTED;
wlr_conn->id = drm_conn->connector_id;
drmModeEncoder *curr_enc = drmModeGetEncoder(drm->fd, drmModeEncoder *curr_enc = drmModeGetEncoder(drm->fd,
conn->encoder_id); drm_conn->encoder_id);
if (curr_enc) { if (curr_enc) {
output->old_crtc = drmModeGetCrtc(drm->fd, curr_enc->crtc_id); wlr_conn->old_crtc = drmModeGetCrtc(drm->fd, curr_enc->crtc_id);
drmModeFreeEncoder(curr_enc); drmModeFreeEncoder(curr_enc);
} }
output->output.phys_width = conn->mmWidth; wlr_conn->output.phys_width = drm_conn->mmWidth;
output->output.phys_height = conn->mmHeight; wlr_conn->output.phys_height = drm_conn->mmHeight;
output->output.subpixel = subpixel_map[conn->subpixel]; wlr_conn->output.subpixel = subpixel_map[drm_conn->subpixel];
snprintf(output->output.name, sizeof(output->output.name), "%s-%"PRIu32, snprintf(wlr_conn->output.name, sizeof(wlr_conn->output.name),
conn_get_name(conn->connector_type), "%s-%"PRIu32,
conn->connector_type_id); conn_get_name(drm_conn->connector_type),
drm_conn->connector_type_id);
wlr_drm_get_connector_props(drm->fd, wlr_drm_get_connector_props(drm->fd, wlr_conn->id, &wlr_conn->props);
output->connector, &output->props);
size_t edid_len = 0; size_t edid_len = 0;
uint8_t *edid = wlr_drm_get_prop_blob(drm->fd, uint8_t *edid = wlr_drm_get_prop_blob(drm->fd,
output->connector, output->props.edid, &edid_len); wlr_conn->id, wlr_conn->props.edid, &edid_len);
parse_edid(&output->output, edid_len, edid); parse_edid(&wlr_conn->output, edid_len, edid);
free(edid); free(edid);
if (list_add(drm->outputs, output) == -1) { if (list_add(drm->outputs, wlr_conn) == -1) {
wlr_log_errno(L_ERROR, "Allocation failed"); wlr_log_errno(L_ERROR, "Allocation failed");
drmModeFreeConnector(conn); drmModeFreeConnector(drm_conn);
wl_event_source_remove(output->retry_pageflip); wl_event_source_remove(wlr_conn->retry_pageflip);
free(output); free(wlr_conn);
continue; continue;
} }
wlr_output_create_global(&output->output, drm->display); wlr_output_create_global(&wlr_conn->output, drm->display);
wlr_log(L_INFO, "Found display '%s'", output->output.name); wlr_log(L_INFO, "Found display '%s'", wlr_conn->output.name);
} else { } else {
output = drm->outputs->items[index]; wlr_conn = drm->outputs->items[index];
seen[index] = true; seen[index] = true;
} }
if (output->state == WLR_DRM_OUTPUT_DISCONNECTED && if (wlr_conn->state == WLR_DRM_CONN_DISCONNECTED &&
conn->connection == DRM_MODE_CONNECTED) { drm_conn->connection == DRM_MODE_CONNECTED) {
wlr_log(L_INFO, "'%s' connected", output->output.name); wlr_log(L_INFO, "'%s' connected", wlr_conn->output.name);
wlr_log(L_INFO, "Detected modes:"); wlr_log(L_INFO, "Detected modes:");
for (int i = 0; i < conn->count_modes; ++i) { for (int i = 0; i < drm_conn->count_modes; ++i) {
struct wlr_drm_output_mode *mode = calloc(1, struct wlr_drm_mode *mode = calloc(1, sizeof(*mode));
sizeof(struct wlr_drm_output_mode));
if (!mode) { if (!mode) {
wlr_log_errno(L_ERROR, "Allocation failed"); wlr_log_errno(L_ERROR, "Allocation failed");
continue; continue;
} }
mode->mode = conn->modes[i]; mode->drm_mode = drm_conn->modes[i];
mode->wlr_mode.width = mode->mode.hdisplay; mode->wlr_mode.width = mode->drm_mode.hdisplay;
mode->wlr_mode.height = mode->mode.vdisplay; mode->wlr_mode.height = mode->drm_mode.vdisplay;
mode->wlr_mode.refresh = calculate_refresh_rate(&mode->mode); mode->wlr_mode.refresh = calculate_refresh_rate(&mode->drm_mode);
wlr_log(L_INFO, " %"PRId32"@%"PRId32"@%"PRId32, wlr_log(L_INFO, " %"PRId32"@%"PRId32"@%"PRId32,
mode->wlr_mode.width, mode->wlr_mode.height, mode->wlr_mode.width, mode->wlr_mode.height,
mode->wlr_mode.refresh); mode->wlr_mode.refresh);
if (list_add(output->output.modes, mode) == -1) { if (list_add(wlr_conn->output.modes, mode) == -1) {
wlr_log_errno(L_ERROR, "Allocation failed"); wlr_log_errno(L_ERROR, "Allocation failed");
free(mode); free(mode);
continue; continue;
} }
} }
output->state = WLR_DRM_OUTPUT_NEEDS_MODESET; wlr_conn->state = WLR_DRM_CONN_NEEDS_MODESET;
wlr_log(L_INFO, "Sending modesetting signal for '%s'", output->output.name); wlr_log(L_INFO, "Sending modesetting signal for '%s'",
wl_signal_emit(&drm->backend.events.output_add, &output->output); wlr_conn->output.name);
} else if (output->state == WLR_DRM_OUTPUT_CONNECTED && wl_signal_emit(&drm->backend.events.output_add, &wlr_conn->output);
conn->connection != DRM_MODE_CONNECTED) { } else if (wlr_conn->state == WLR_DRM_CONN_CONNECTED &&
drm_conn->connection != DRM_MODE_CONNECTED) {
wlr_log(L_INFO, "'%s' disconnected", output->output.name); wlr_log(L_INFO, "'%s' disconnected", wlr_conn->output.name);
wlr_drm_output_cleanup(output); wlr_drm_connector_cleanup(wlr_conn);
} }
drmModeFreeConnector(conn); drmModeFreeConnector(drm_conn);
} }
drmModeFreeResources(res); drmModeFreeResources(res);
@ -757,14 +759,14 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
continue; continue;
} }
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
wlr_log(L_INFO, "'%s' disappeared", output->output.name); wlr_log(L_INFO, "'%s' disappeared", conn->output.name);
wlr_drm_output_cleanup(output); wlr_drm_connector_cleanup(conn);
drmModeFreeCrtc(output->old_crtc); drmModeFreeCrtc(conn->old_crtc);
wl_event_source_remove(output->retry_pageflip); wl_event_source_remove(conn->retry_pageflip);
free(output); free(conn);
list_del(drm->outputs, i); list_del(drm->outputs, i);
} }
@ -772,22 +774,22 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
static void page_flip_handler(int fd, unsigned seq, static void page_flip_handler(int fd, unsigned seq,
unsigned tv_sec, unsigned tv_usec, void *user) { unsigned tv_sec, unsigned tv_usec, void *user) {
struct wlr_drm_output *output = user; struct wlr_drm_connector *conn = user;
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
output->pageflip_pending = false; conn->pageflip_pending = false;
if (output->state != WLR_DRM_OUTPUT_CONNECTED) { if (conn->state != WLR_DRM_CONN_CONNECTED) {
return; return;
} }
struct wlr_drm_plane *plane = output->crtc->primary; struct wlr_drm_plane *plane = conn->crtc->primary;
if (plane->surf.front) { if (plane->surf.front) {
gbm_surface_release_buffer(plane->surf.gbm, plane->surf.front); gbm_surface_release_buffer(plane->surf.gbm, plane->surf.front);
plane->surf.front = NULL; plane->surf.front = NULL;
} }
if (drm->session->active) { if (drm->session->active) {
wl_signal_emit(&output->output.events.frame, &output->output); wl_signal_emit(&conn->output.events.frame, &conn->output);
} }
} }
@ -805,9 +807,9 @@ void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
uint64_t to_close = (1 << drm->outputs->length) - 1; uint64_t to_close = (1 << drm->outputs->length) - 1;
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
if (output->state == WLR_DRM_OUTPUT_CONNECTED) { if (conn->state == WLR_DRM_CONN_CONNECTED) {
output->state = WLR_DRM_OUTPUT_CLEANUP; conn->state = WLR_DRM_CONN_CLEANUP;
} }
} }
@ -816,8 +818,8 @@ void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
while (to_close && time(NULL) < timeout) { while (to_close && time(NULL) < timeout) {
wlr_drm_event(drm->fd, 0, NULL); wlr_drm_event(drm->fd, 0, NULL);
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
if (output->state != WLR_DRM_OUTPUT_CLEANUP || !output->pageflip_pending) { if (conn->state != WLR_DRM_CONN_CLEANUP || !conn->pageflip_pending) {
to_close &= ~(1 << i); to_close &= ~(1 << i);
} }
} }
@ -828,29 +830,29 @@ void wlr_drm_restore_outputs(struct wlr_drm_backend *drm) {
} }
for (size_t i = 0; i < drm->outputs->length; ++i) { for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_drm_output *output = drm->outputs->items[i]; struct wlr_drm_connector *conn = drm->outputs->items[i];
drmModeCrtc *crtc = output->old_crtc; drmModeCrtc *crtc = conn->old_crtc;
if (!crtc) { if (!crtc) {
continue; continue;
} }
drmModeSetCrtc(drm->fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y, drmModeSetCrtc(drm->fd, crtc->crtc_id, crtc->buffer_id, crtc->x, crtc->y,
&output->connector, 1, &crtc->mode); &conn->id, 1, &crtc->mode);
drmModeFreeCrtc(crtc); drmModeFreeCrtc(crtc);
} }
} }
void wlr_drm_output_cleanup(struct wlr_drm_output *output) { void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
if (!output) { if (!conn) {
return; return;
} }
struct wlr_drm_backend *drm = output->drm; struct wlr_drm_backend *drm = conn->drm;
switch (output->state) { switch (conn->state) {
case WLR_DRM_OUTPUT_CONNECTED: case WLR_DRM_CONN_CONNECTED:
case WLR_DRM_OUTPUT_CLEANUP:; case WLR_DRM_CONN_CLEANUP:;
struct wlr_drm_crtc *crtc = output->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
wlr_drm_surface_finish(&drm->renderer, &crtc->planes[i]->surf); wlr_drm_surface_finish(&drm->renderer, &crtc->planes[i]->surf);
if (crtc->planes[i] && crtc->planes[i]->id == 0) { if (crtc->planes[i] && crtc->planes[i]->id == 0) {
@ -859,17 +861,17 @@ void wlr_drm_output_cleanup(struct wlr_drm_output *output) {
} }
} }
output->crtc = NULL; conn->crtc = NULL;
output->possible_crtc = 0; conn->possible_crtc = 0;
/* Fallthrough */ /* Fallthrough */
case WLR_DRM_OUTPUT_NEEDS_MODESET: case WLR_DRM_CONN_NEEDS_MODESET:
wlr_log(L_INFO, "Emmiting destruction signal for '%s'", wlr_log(L_INFO, "Emmiting destruction signal for '%s'",
output->output.name); conn->output.name);
wl_signal_emit(&drm->backend.events.output_remove, &output->output); wl_signal_emit(&drm->backend.events.output_remove, &conn->output);
break; break;
case WLR_DRM_OUTPUT_DISCONNECTED: case WLR_DRM_CONN_DISCONNECTED:
break; break;
} }
output->state = WLR_DRM_OUTPUT_DISCONNECTED; conn->state = WLR_DRM_CONN_DISCONNECTED;
} }

20
backend/drm/iface_atomic.c
View File

@ -44,23 +44,23 @@ static bool atomic_end(int drm_fd, struct atomic *atom) {
} }
static bool atomic_commit(int drm_fd, struct atomic *atom, static bool atomic_commit(int drm_fd, struct atomic *atom,
struct wlr_drm_output *output, uint32_t flag, bool modeset) { struct wlr_drm_connector *conn, uint32_t flag, bool modeset) {
if (atom->failed) { if (atom->failed) {
return false; return false;
} }
uint32_t flags = DRM_MODE_PAGE_FLIP_EVENT | flag; uint32_t flags = DRM_MODE_PAGE_FLIP_EVENT | flag;
int ret = drmModeAtomicCommit(drm_fd, atom->req, flags, output); int ret = drmModeAtomicCommit(drm_fd, atom->req, flags, conn);
if (ret) { if (ret) {
wlr_log_errno(L_ERROR, "%s: Atomic commit failed (%s)", wlr_log_errno(L_ERROR, "%s: Atomic commit failed (%s)",
output->output.name, modeset ? "modeset" : "pageflip"); conn->output.name, modeset ? "modeset" : "pageflip");
// Try to commit without new changes // Try to commit without new changes
drmModeAtomicSetCursor(atom->req, atom->cursor); drmModeAtomicSetCursor(atom->req, atom->cursor);
if (drmModeAtomicCommit(drm_fd, atom->req, flags, output)) { if (drmModeAtomicCommit(drm_fd, atom->req, flags, conn)) {
wlr_log_errno(L_ERROR, "%s: Atomic commit failed (%s)", wlr_log_errno(L_ERROR, "%s: Atomic commit failed (%s)",
output->output.name, modeset ? "modeset" : "pageflip"); conn->output.name, modeset ? "modeset" : "pageflip");
} }
} }
@ -97,7 +97,7 @@ static void set_plane_props(struct atomic *atom, struct wlr_drm_plane *plane,
} }
static bool atomic_crtc_pageflip(struct wlr_drm_backend *drm, static bool atomic_crtc_pageflip(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, struct wlr_drm_connector *conn,
struct wlr_drm_crtc *crtc, struct wlr_drm_crtc *crtc,
uint32_t fb_id, drmModeModeInfo *mode) { uint32_t fb_id, drmModeModeInfo *mode) {
if (mode) { if (mode) {
@ -114,18 +114,18 @@ static bool atomic_crtc_pageflip(struct wlr_drm_backend *drm,
struct atomic atom; struct atomic atom;
atomic_begin(crtc, &atom); atomic_begin(crtc, &atom);
atomic_add(&atom, output->connector, output->props.crtc_id, crtc->id); atomic_add(&atom, conn->id, conn->props.crtc_id, crtc->id);
atomic_add(&atom, crtc->id, crtc->props.mode_id, crtc->mode_id); atomic_add(&atom, crtc->id, crtc->props.mode_id, crtc->mode_id);
atomic_add(&atom, crtc->id, crtc->props.active, 1); atomic_add(&atom, crtc->id, crtc->props.active, 1);
set_plane_props(&atom, crtc->primary, crtc->id, fb_id, true); set_plane_props(&atom, crtc->primary, crtc->id, fb_id, true);
return atomic_commit(drm->fd, &atom, output, return atomic_commit(drm->fd, &atom, conn,
mode ? DRM_MODE_ATOMIC_ALLOW_MODESET : DRM_MODE_ATOMIC_NONBLOCK, mode ? DRM_MODE_ATOMIC_ALLOW_MODESET : DRM_MODE_ATOMIC_NONBLOCK,
mode); mode);
} }
static void atomic_conn_enable(struct wlr_drm_backend *drm, static void atomic_conn_enable(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, bool enable) { struct wlr_drm_connector *conn, bool enable) {
struct wlr_drm_crtc *crtc = output->crtc; struct wlr_drm_crtc *crtc = conn->crtc;
struct atomic atom; struct atomic atom;
atomic_begin(crtc, &atom); atomic_begin(crtc, &atom);

14
backend/drm/iface_legacy.c
View File

@ -7,18 +7,18 @@
#include "backend/drm/util.h" #include "backend/drm/util.h"
static bool legacy_crtc_pageflip(struct wlr_drm_backend *drm, static bool legacy_crtc_pageflip(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, struct wlr_drm_crtc *crtc, struct wlr_drm_connector *conn, struct wlr_drm_crtc *crtc,
uint32_t fb_id, drmModeModeInfo *mode) { uint32_t fb_id, drmModeModeInfo *mode) {
if (mode) { if (mode) {
if (drmModeSetCrtc(drm->fd, crtc->id, fb_id, 0, 0, if (drmModeSetCrtc(drm->fd, crtc->id, fb_id, 0, 0,
&output->connector, 1, mode)) { &conn->id, 1, mode)) {
wlr_log_errno(L_ERROR, "%s: Failed to set CRTC", output->output.name); wlr_log_errno(L_ERROR, "%s: Failed to set CRTC", conn->output.name);
return false; return false;
} }
} }
if (drmModePageFlip(drm->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, output)) { if (drmModePageFlip(drm->fd, crtc->id, fb_id, DRM_MODE_PAGE_FLIP_EVENT, conn)) {
wlr_log_errno(L_ERROR, "%s: Failed to page flip", output->output.name); wlr_log_errno(L_ERROR, "%s: Failed to page flip", conn->output.name);
return false; return false;
} }
@ -26,8 +26,8 @@ static bool legacy_crtc_pageflip(struct wlr_drm_backend *drm,
} }
static void legacy_conn_enable(struct wlr_drm_backend *drm, static void legacy_conn_enable(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, bool enable) { struct wlr_drm_connector *conn, bool enable) {
drmModeConnectorSetProperty(drm->fd, output->connector, output->props.dpms, drmModeConnectorSetProperty(drm->fd, conn->id, conn->props.dpms,
enable ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF); enable ? DRM_MODE_DPMS_ON : DRM_MODE_DPMS_OFF);
} }

34
include/backend/drm/drm.h
View File

@ -55,16 +55,6 @@ struct wlr_drm_crtc {
struct wl_list connectors; 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_backend { struct wlr_drm_backend {
struct wlr_backend backend; struct wlr_backend backend;
@ -107,24 +97,24 @@ struct wlr_drm_backend {
struct wlr_session *session; struct wlr_session *session;
}; };
enum wlr_drm_output_state { enum wlr_drm_connector_state {
WLR_DRM_OUTPUT_DISCONNECTED, WLR_DRM_CONN_DISCONNECTED,
WLR_DRM_OUTPUT_NEEDS_MODESET, WLR_DRM_CONN_NEEDS_MODESET,
WLR_DRM_OUTPUT_CLEANUP, WLR_DRM_CONN_CLEANUP,
WLR_DRM_OUTPUT_CONNECTED, WLR_DRM_CONN_CONNECTED,
}; };
struct wlr_drm_output_mode { struct wlr_drm_mode {
struct wlr_output_mode wlr_mode; struct wlr_output_mode wlr_mode;
drmModeModeInfo mode; drmModeModeInfo drm_mode;
}; };
struct wlr_drm_output { struct wlr_drm_connector {
struct wlr_output output; struct wlr_output output;
struct wlr_drm_backend *drm; struct wlr_drm_backend *drm;
enum wlr_drm_output_state state; enum wlr_drm_connector_state state;
uint32_t connector; uint32_t id;
struct wlr_drm_crtc *crtc; struct wlr_drm_crtc *crtc;
uint32_t possible_crtc; uint32_t possible_crtc;
@ -144,10 +134,10 @@ bool wlr_drm_check_features(struct wlr_drm_backend *drm);
bool wlr_drm_resources_init(struct wlr_drm_backend *drm); bool wlr_drm_resources_init(struct wlr_drm_backend *drm);
void wlr_drm_resources_free(struct wlr_drm_backend *drm); void wlr_drm_resources_free(struct wlr_drm_backend *drm);
void wlr_drm_restore_outputs(struct wlr_drm_backend *drm); void wlr_drm_restore_outputs(struct wlr_drm_backend *drm);
void wlr_drm_output_cleanup(struct wlr_drm_output *output); void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn);
void wlr_drm_scan_connectors(struct wlr_drm_backend *state); void wlr_drm_scan_connectors(struct wlr_drm_backend *state);
int wlr_drm_event(int fd, uint32_t mask, void *data); int wlr_drm_event(int fd, uint32_t mask, void *data);
void wlr_drm_output_start_renderer(struct wlr_drm_output *output); void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn);
#endif #endif

8
include/backend/drm/iface.h
View File

@ -9,17 +9,17 @@
#include <xf86drmMode.h> #include <xf86drmMode.h>
struct wlr_drm_backend; struct wlr_drm_backend;
struct wlr_drm_output; struct wlr_drm_connector;
struct wlr_drm_crtc; struct wlr_drm_crtc;
// Used to provide atomic or legacy DRM functions // Used to provide atomic or legacy DRM functions
struct wlr_drm_interface { struct wlr_drm_interface {
// Enable or disable DPMS for output // Enable or disable DPMS for connector
void (*conn_enable)(struct wlr_drm_backend *drm, void (*conn_enable)(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, bool enable); struct wlr_drm_connector *conn, bool enable);
// Pageflip on crtc. If mode is non-NULL perform a full modeset using it. // Pageflip on crtc. If mode is non-NULL perform a full modeset using it.
bool (*crtc_pageflip)(struct wlr_drm_backend *drm, bool (*crtc_pageflip)(struct wlr_drm_backend *drm,
struct wlr_drm_output *output, struct wlr_drm_crtc *crtc, struct wlr_drm_connector *conn, struct wlr_drm_crtc *crtc,
uint32_t fb_id, drmModeModeInfo *mode); uint32_t fb_id, drmModeModeInfo *mode);
// Enable the cursor buffer on crtc. Set bo to NULL to disable // Enable the cursor buffer on crtc. Set bo to NULL to disable
bool (*crtc_set_cursor)(struct wlr_drm_backend *drm, bool (*crtc_set_cursor)(struct wlr_drm_backend *drm,