From 7b772e1a4b8c7a06fbcf0ec57766af3a5384bf0c Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Thu, 20 Jul 2017 20:51:59 +1200 Subject: DRM resource initalisation --- include/backend/drm.h | 94 --------------------------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 include/backend/drm.h (limited to 'include') diff --git a/include/backend/drm.h b/include/backend/drm.h deleted file mode 100644 index ecdd945b..00000000 --- a/include/backend/drm.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef DRM_BACKEND_H -#define DRM_BACKEND_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "backend/egl.h" -#include "backend/udev.h" - -struct wlr_drm_renderer { - int fd; - struct gbm_device *gbm; - struct wlr_egl egl; -}; - -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 { - int fd; - dev_t dev; - - struct wlr_backend *backend; - struct wl_display *display; - struct wl_event_source *drm_event; - - struct wl_listener session_signal; - struct wl_listener drm_invalidated; - - uint32_t taken_crtcs; - list_t *outputs; - - struct wlr_drm_renderer renderer; - struct wlr_session *session; - struct wlr_udev *udev; -}; - -enum wlr_drm_output_state { - DRM_OUTPUT_DISCONNECTED, - DRM_OUTPUT_NEEDS_MODESET, - DRM_OUTPUT_CONNECTED, -}; - -struct wlr_output_mode_state { - struct wlr_wl_output_mode *wlr_mode; - drmModeModeInfo mode; -}; - -struct wlr_output_state { - struct wlr_output *wlr_output; - enum wlr_drm_output_state state; - uint32_t connector; - - struct { - uint32_t dpms; - } 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; -}; - -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); - -#endif -- cgit v1.2.3 From 1db97a9af906524b577e5f1a4f842e18a0a942a4 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Sun, 6 Aug 2017 21:38:40 +1200 Subject: Updated DRM cursor rendering --- backend/drm/backend.c | 1 + backend/drm/drm.c | 141 ++++++++++++++++++++++++++------------------ backend/drm/drm.h | 8 ++- include/wlr/render/matrix.h | 6 ++ render/matrix.c | 60 +++++++++++++++++++ types/wlr_output.c | 61 +------------------ 6 files changed, 159 insertions(+), 118 deletions(-) (limited to 'include') diff --git a/backend/drm/backend.c b/backend/drm/backend.c index dde34003..0a378477 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -53,6 +53,7 @@ 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"); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 1cc52d35..5de99b78 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -15,6 +15,9 @@ #include #include #include +#include +#include +#include #include "drm.h" #include "drm-util.h" @@ -174,7 +177,7 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer) { } static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer, - struct wlr_drm_plane *plane, uint32_t width, uint32_t height) { + struct wlr_drm_plane *plane, uint32_t width, uint32_t height, uint32_t flags) { if (plane->width == width && plane->height == height) { return true; } @@ -183,7 +186,7 @@ static bool wlr_drm_plane_renderer_init(struct wlr_drm_renderer *renderer, plane->height = height; plane->gbm = gbm_surface_create(renderer->gbm, width, height, - GBM_FORMAT_XRGB8888, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); + GBM_FORMAT_ARGB8888, GBM_BO_USE_RENDERING | flags); if (!plane->gbm) { wlr_log_errno(L_ERROR, "Failed to create GBM surface for plane"); return false; @@ -203,8 +206,6 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer, if (!renderer || !plane) return; - wlr_log(L_DEBUG, "%s called", __func__); - if (plane->front) gbm_surface_release_buffer(plane->gbm, plane->front); if (plane->back) @@ -215,12 +216,19 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer, if (plane->gbm) gbm_surface_destroy(plane->gbm); + if (plane->wlr_surf) + wlr_surface_destroy(plane->wlr_surf); + if (plane->wlr_rend) + wlr_renderer_destroy(plane->wlr_rend); + plane->width = 0; plane->height = 0; plane->egl = EGL_NO_SURFACE; plane->gbm = NULL; plane->front = NULL; plane->back = NULL; + plane->wlr_rend = NULL; + plane->wlr_surf = NULL; } static void free_fb(struct gbm_bo *bo, void *data) { @@ -480,7 +488,7 @@ static bool wlr_drm_output_set_mode(struct wlr_output_state *output, continue; if (!wlr_drm_plane_renderer_init(&drm->renderer, crtc->primary, - mode->width, mode->height)) { + mode->width, mode->height, GBM_BO_USE_SCANOUT)) { wlr_log(L_ERROR, "Failed to initalise renderer for plane"); goto error_enc; } @@ -506,79 +514,95 @@ static void wlr_drm_output_transform(struct wlr_output_state *output, output->base->transform = transform; } -static bool wlr_drm_output_set_cursor(struct wlr_output_state *output, - const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) { - struct wlr_backend_state *state = wl_container_of(output->renderer, state, renderer); - if (!buf) { - drmModeSetCursor(state->fd, output->crtc->id, 0, 0, 0); +bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc) { + if (!crtc || !crtc->cursor || !crtc->cursor->gbm) return true; - } - if (!gbm_device_is_format_supported(state->renderer.gbm, - GBM_FORMAT_ARGB8888, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE)) { - wlr_log(L_ERROR, "Failed to create cursor bo: ARGB8888 pixel format is " - "unsupported on this device"); + struct wlr_drm_plane *plane = crtc->cursor; + + uint32_t bo_handle = gbm_bo_get_handle(plane->back).u32; + if (drmModeSetCursor(drm->fd, crtc->id, bo_handle, plane->width, plane->height)) { + wlr_log_errno(L_ERROR, "Failed to set hardware cursor"); return false; } - uint64_t bo_width, bo_height; - int ret; + return true; +} - ret = drmGetCap(state->fd, DRM_CAP_CURSOR_WIDTH, &bo_width); - bo_width = ret ? 64 : bo_width; - ret = drmGetCap(state->fd, DRM_CAP_CURSOR_HEIGHT, &bo_height); - bo_height = ret ? 64 : bo_height; +static bool wlr_drm_output_set_cursor(struct wlr_output_state *output, + const uint8_t *buf, int32_t stride, uint32_t width, uint32_t height) { + struct wlr_backend_state *drm = wl_container_of(output->renderer, drm, renderer); + struct wlr_drm_renderer *renderer = output->renderer; + struct wlr_drm_crtc *crtc = output->crtc; + struct wlr_drm_plane *plane = crtc->cursor; - if (width > bo_width || height > bo_width) { - wlr_log(L_INFO, "Cursor too large (max %dx%d)", (int)bo_width, (int)bo_height); - return false; + if (!buf) { + drmModeSetCursor(drm->fd, crtc->id, 0, 0, 0); + return true; } - for (int i = 0; i < 2; ++i) { - if (output->cursor_bo[i]) { - continue; + if (!plane) { + plane = calloc(1, sizeof(*plane)); + if (!plane) { + wlr_log_errno(L_ERROR, "Allocation failed"); + return false; } + crtc->cursor = plane; + } - output->cursor_bo[i] = gbm_bo_create(state->renderer.gbm, bo_width, bo_height, - GBM_FORMAT_ARGB8888, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE); + if (!plane->gbm) { + int ret; + uint64_t w, h; + ret = drmGetCap(drm->fd, DRM_CAP_CURSOR_WIDTH, &w); + w = ret ? 64 : w; + ret = drmGetCap(drm->fd, DRM_CAP_CURSOR_HEIGHT, &h); + h = ret ? 64 : h; + + if (width > w || height > h) { + wlr_log(L_INFO, "Cursor too large (max %dx%d)", (int)w, (int)h); + return false; + } - if (!output->cursor_bo[i]) { - wlr_log(L_ERROR, "Failed to create cursor bo"); + if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, GBM_BO_USE_CURSOR)) { + wlr_log(L_ERROR, "Cannot allocate cursor resources"); return false; } - } - struct gbm_bo *bo; - output->current_cursor ^= 1; - bo = output->cursor_bo[output->current_cursor]; + wlr_matrix_surface(plane->matrix, plane->width, plane->height, + output->base->transform); - uint32_t bo_stride = gbm_bo_get_stride(bo); - uint8_t tmp[bo_stride * height]; - memset(tmp, 0, sizeof(tmp)); + plane->wlr_rend = wlr_gles2_renderer_init(); + if (!plane->wlr_rend) + return false; - for (size_t i = 0; i < height; ++i) { - memcpy(tmp + i * bo_stride, buf + i * stride * 4, width * 4); + plane->wlr_surf = wlr_render_surface_init(plane->wlr_rend); + if (!plane->wlr_surf) + return false; } - if (gbm_bo_write(bo, tmp, sizeof(tmp)) < 0) { - wlr_log(L_ERROR, "Failed to write cursor to bo"); - return false; - } + wlr_drm_plane_make_current(renderer, plane); - uint32_t bo_handle = gbm_bo_get_handle(bo).u32; - if (drmModeSetCursor(state->fd, output->crtc->id, bo_handle, bo_width, bo_height)) { - wlr_log_errno(L_INFO, "Failed to set hardware cursor"); - return false; - } + wlr_surface_attach_pixels(plane->wlr_surf, WL_SHM_FORMAT_ARGB8888, + stride, width, height, buf); - return true; + glViewport(0, 0, plane->width, plane->height); + glClearColor(0, 0, 0, 0); + glClear(GL_COLOR_BUFFER_BIT); + + float matrix[16]; + wlr_surface_get_matrix(plane->wlr_surf, &matrix, &plane->matrix, 0, 0); + wlr_render_with_matrix(plane->wlr_rend, plane->wlr_surf, &matrix); + + wlr_drm_plane_swap_buffers(renderer, plane); + + return wlr_drm_crtc_set_cursor(drm, crtc); } static bool wlr_drm_output_move_cursor(struct wlr_output_state *output, int x, int y) { - struct wlr_backend_state *state = - wl_container_of(output->renderer, state, renderer); - return !drmModeMoveCursor(state->fd, output->crtc->id, x, y); + struct wlr_backend_state *drm = + wl_container_of(output->renderer, drm, renderer); + return !drmModeMoveCursor(drm->fd, output->crtc->id, x, y); } static void wlr_drm_output_destroy(struct wlr_output_state *output) { @@ -786,9 +810,14 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) { restore = false; } - wlr_drm_plane_renderer_free(renderer, output->crtc->overlay); - wlr_drm_plane_renderer_free(renderer, output->crtc->primary); - wlr_drm_plane_renderer_free(renderer, output->crtc->cursor); + struct wlr_drm_crtc *crtc = output->crtc; + for (int i = 0; i < 3; ++i) { + wlr_drm_plane_renderer_free(renderer, crtc->planes[i]); + if (crtc->planes[i] && crtc->planes[i]->id == 0) { + free(crtc->planes[i]); + crtc->planes[i] = NULL; + } + } output->crtc = NULL; output->possible_crtc = 0; diff --git a/backend/drm/drm.h b/backend/drm/drm.h index feb932df..91346169 100644 --- a/backend/drm/drm.h +++ b/backend/drm/drm.h @@ -21,11 +21,9 @@ struct wlr_drm_plane { uint32_t type; uint32_t id; - uint32_t fb_id; uint32_t possible_crtcs; - int32_t x, y; uint32_t width, height; struct gbm_surface *gbm; @@ -34,6 +32,11 @@ struct wlr_drm_plane { 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; + union wlr_drm_plane_props props; }; @@ -159,5 +162,6 @@ 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); +bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc); #endif diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h index 954207da..be6a947d 100644 --- a/include/wlr/render/matrix.h +++ b/include/wlr/render/matrix.h @@ -1,10 +1,16 @@ #ifndef _WLR_RENDER_MATRIX_H #define _WLR_RENDER_MATRIX_H +#include + 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 diff --git a/render/matrix.c b/render/matrix.c index 4de20e5d..c7b11efe 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -1,5 +1,6 @@ #include #include +#include #include /* 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; +} diff --git a/types/wlr_output.c b/types/wlr_output.c index e79e12d3..7d3cdbed 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -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, -- cgit v1.2.3 From 5f7042a1f22247b478b6225c3e1356c72cdd72ba Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Sun, 6 Aug 2017 21:49:04 +1200 Subject: Moved headers --- backend/drm/backend.c | 4 +- backend/drm/drm-properties.c | 2 +- backend/drm/drm-properties.h | 62 --------------- backend/drm/drm-util.c | 2 +- backend/drm/drm-util.h | 37 --------- backend/drm/drm.c | 4 +- backend/drm/drm.h | 167 --------------------------------------- include/backend/drm-properties.h | 62 +++++++++++++++ include/backend/drm-util.h | 37 +++++++++ include/backend/drm.h | 167 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 272 insertions(+), 272 deletions(-) delete mode 100644 backend/drm/drm-properties.h delete mode 100644 backend/drm/drm-util.h delete mode 100644 backend/drm/drm.h create mode 100644 include/backend/drm-properties.h create mode 100644 include/backend/drm-util.h create mode 100644 include/backend/drm.h (limited to 'include') diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 0a378477..68eae890 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include "drm.h" +#include "backend/udev.h" +#include "backend/drm.h" static bool wlr_drm_backend_init(struct wlr_backend_state *drm) { wlr_drm_scan_connectors(drm); diff --git a/backend/drm/drm-properties.c b/backend/drm/drm-properties.c index 391ae38c..1b6e745f 100644 --- a/backend/drm/drm-properties.c +++ b/backend/drm/drm-properties.c @@ -5,7 +5,7 @@ #include #include #include -#include "drm-properties.h" +#include "backend/drm-properties.h" /* * Creates a mapping between property names and an array index where to store diff --git a/backend/drm/drm-properties.h b/backend/drm/drm-properties.h deleted file mode 100644 index 287fc1e0..00000000 --- a/backend/drm/drm-properties.h +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef DRM_PROPERTIES_H -#define DRM_PROPERTIES_H - -#include -#include - -/* - * 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 diff --git a/backend/drm/drm-util.c b/backend/drm/drm-util.c index 68f35fe0..6159b5de 100644 --- a/backend/drm/drm-util.c +++ b/backend/drm/drm-util.c @@ -2,7 +2,7 @@ #include #include #include -#include "drm-util.h" +#include "backend/drm-util.h" int32_t calculate_refresh_rate(drmModeModeInfo *mode) { int32_t refresh = (mode->clock * 1000000LL / mode->htotal + diff --git a/backend/drm/drm-util.h b/backend/drm/drm-util.h deleted file mode 100644 index 759bdb48..00000000 --- a/backend/drm/drm-util.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef WLR_DRM_UTIL_H -#define WLR_DRM_UTIL_H - -#include -#include -#include -#include - -// 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 diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 67a48dda..d739edad 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -18,8 +18,8 @@ #include #include #include -#include "drm.h" -#include "drm-util.h" +#include "backend/drm.h" +#include "backend/drm-util.h" bool wlr_drm_check_features(struct wlr_backend_state *drm) { if (drmSetClientCap(drm->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) { diff --git a/backend/drm/drm.h b/backend/drm/drm.h deleted file mode 100644 index 91346169..00000000 --- a/backend/drm/drm.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef DRM_BACKEND_H -#define DRM_BACKEND_H - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#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; - - 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; - struct gbm_device *gbm; - struct wlr_egl egl; -}; - -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; - - 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; - - struct wl_listener session_signal; - struct wl_listener drm_invalidated; - - uint32_t taken_crtcs; - list_t *outputs; - - struct wlr_drm_renderer renderer; - struct wlr_session *session; - struct wlr_udev *udev; -}; - -enum wlr_drm_output_state { - WLR_DRM_OUTPUT_DISCONNECTED, - WLR_DRM_OUTPUT_NEEDS_MODESET, - WLR_DRM_OUTPUT_CONNECTED, -}; - -struct wlr_output_mode_state { - struct wlr_wl_output_mode *wlr_mode; - drmModeModeInfo mode; -}; - -struct wlr_output_state { - struct wlr_output *base; - enum wlr_drm_output_state state; - uint32_t connector; - - struct wlr_drm_crtc *crtc; - uint32_t possible_crtc; - - union wlr_drm_connector_props props; - - uint32_t width; - uint32_t height; - - drmModeCrtc *old_crtc; - - struct wlr_drm_renderer *renderer; - struct gbm_bo *bo[2]; - struct gbm_bo *cursor_bo[2]; - int current_cursor; - uint32_t cursor_width, cursor_height; - - bool pageflip_pending; -}; - -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); -bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc); - -#endif diff --git a/include/backend/drm-properties.h b/include/backend/drm-properties.h new file mode 100644 index 00000000..287fc1e0 --- /dev/null +++ b/include/backend/drm-properties.h @@ -0,0 +1,62 @@ +#ifndef DRM_PROPERTIES_H +#define DRM_PROPERTIES_H + +#include +#include + +/* + * 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 diff --git a/include/backend/drm-util.h b/include/backend/drm-util.h new file mode 100644 index 00000000..759bdb48 --- /dev/null +++ b/include/backend/drm-util.h @@ -0,0 +1,37 @@ +#ifndef WLR_DRM_UTIL_H +#define WLR_DRM_UTIL_H + +#include +#include +#include +#include + +// 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 diff --git a/include/backend/drm.h b/include/backend/drm.h new file mode 100644 index 00000000..91346169 --- /dev/null +++ b/include/backend/drm.h @@ -0,0 +1,167 @@ +#ifndef DRM_BACKEND_H +#define DRM_BACKEND_H + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#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; + + 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; + struct gbm_device *gbm; + struct wlr_egl egl; +}; + +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; + + 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; + + struct wl_listener session_signal; + struct wl_listener drm_invalidated; + + uint32_t taken_crtcs; + list_t *outputs; + + struct wlr_drm_renderer renderer; + struct wlr_session *session; + struct wlr_udev *udev; +}; + +enum wlr_drm_output_state { + WLR_DRM_OUTPUT_DISCONNECTED, + WLR_DRM_OUTPUT_NEEDS_MODESET, + WLR_DRM_OUTPUT_CONNECTED, +}; + +struct wlr_output_mode_state { + struct wlr_wl_output_mode *wlr_mode; + drmModeModeInfo mode; +}; + +struct wlr_output_state { + struct wlr_output *base; + enum wlr_drm_output_state state; + uint32_t connector; + + struct wlr_drm_crtc *crtc; + uint32_t possible_crtc; + + union wlr_drm_connector_props props; + + uint32_t width; + uint32_t height; + + drmModeCrtc *old_crtc; + + struct wlr_drm_renderer *renderer; + struct gbm_bo *bo[2]; + struct gbm_bo *cursor_bo[2]; + int current_cursor; + uint32_t cursor_width, cursor_height; + + bool pageflip_pending; +}; + +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); +bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc *crtc); + +#endif -- cgit v1.2.3 From 5a636b21ba8c8a42e827fbef24cced82f012ae5b Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Sun, 6 Aug 2017 21:51:34 +1200 Subject: Remove old fields --- include/backend/drm.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/backend/drm.h b/include/backend/drm.h index 91346169..9bdd79fd 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -145,10 +145,6 @@ struct wlr_output_state { drmModeCrtc *old_crtc; struct wlr_drm_renderer *renderer; - struct gbm_bo *bo[2]; - struct gbm_bo *cursor_bo[2]; - int current_cursor; - uint32_t cursor_width, cursor_height; bool pageflip_pending; }; -- cgit v1.2.3 From d09ca20a4dccd7696423fc9f17acc88b7b3a7986 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Mon, 7 Aug 2017 21:07:42 +1200 Subject: Use gbm_bo_map for cursor --- backend/drm/drm.c | 43 ++++++++++++++++++++++++++++++++++++++----- backend/egl.c | 2 +- include/backend/drm.h | 1 + 3 files changed, 40 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index edcff083..700eb554 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -10,7 +10,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -229,6 +230,9 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer, if (plane->wlr_rend) { wlr_renderer_destroy(plane->wlr_rend); } + if (plane->cursor_bo) { + gbm_bo_destroy(plane->cursor_bo); + } plane->width = 0; plane->height = 0; @@ -238,6 +242,7 @@ static void wlr_drm_plane_renderer_free(struct wlr_drm_renderer *renderer, plane->back = NULL; plane->wlr_rend = NULL; plane->wlr_surf = NULL; + plane->cursor_bo = NULL; } static void free_fb(struct gbm_bo *bo, void *data) { @@ -543,7 +548,7 @@ bool wlr_drm_crtc_set_cursor(struct wlr_backend_state *drm, struct wlr_drm_crtc struct wlr_drm_plane *plane = crtc->cursor; - uint32_t bo_handle = gbm_bo_get_handle(plane->back).u32; + uint32_t bo_handle = gbm_bo_get_handle(plane->cursor_bo).u32; if (drmModeSetCursor(drm->fd, crtc->id, bo_handle, plane->width, plane->height)) { wlr_log_errno(L_ERROR, "Failed to set hardware cursor"); return false; @@ -586,13 +591,22 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output, return false; } - if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, GBM_BO_USE_CURSOR)) { + if (!wlr_drm_plane_renderer_init(renderer, plane, w, h, 0)) { wlr_log(L_ERROR, "Cannot allocate cursor resources"); return false; } + plane->cursor_bo = gbm_bo_create(renderer->gbm, w, h, GBM_FORMAT_ARGB8888, + GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE); + if (!plane->cursor_bo) { + wlr_log_errno(L_ERROR, "Failed to create cursor bo"); + return false; + } + + // OpenGL will read the pixels out upside down, + // so we need to flip the image vertically wlr_matrix_surface(plane->matrix, plane->width, plane->height, - output->base->transform); + output->base->transform ^ WL_OUTPUT_TRANSFORM_FLIPPED_180); plane->wlr_rend = wlr_gles2_renderer_init(); if (!plane->wlr_rend) { @@ -605,21 +619,40 @@ static bool wlr_drm_output_set_cursor(struct wlr_output_state *output, } } + struct gbm_bo *bo = plane->cursor_bo; + uint32_t bo_width = gbm_bo_get_width(bo); + uint32_t bo_height = gbm_bo_get_height(bo); + uint32_t bo_stride; + void *bo_data; + + if (!gbm_bo_map(bo, 0, 0, bo_width, bo_height, + GBM_BO_TRANSFER_WRITE, &bo_stride, &bo_data)) { + wlr_log_errno(L_ERROR, "Unable to map buffer"); + return false; + } + wlr_drm_plane_make_current(renderer, plane); wlr_surface_attach_pixels(plane->wlr_surf, WL_SHM_FORMAT_ARGB8888, stride, width, height, buf); glViewport(0, 0, plane->width, plane->height); - glClearColor(0, 0, 0, 0); + glClearColor(0.0, 0.0, 0.0, 0.0); glClear(GL_COLOR_BUFFER_BIT); float matrix[16]; wlr_surface_get_matrix(plane->wlr_surf, &matrix, &plane->matrix, 0, 0); wlr_render_with_matrix(plane->wlr_rend, plane->wlr_surf, &matrix); + glFinish(); + glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, bo_stride); + glReadPixels(0, 0, plane->width, plane->height, GL_BGRA_EXT, GL_UNSIGNED_BYTE, bo_data); + glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0); + wlr_drm_plane_swap_buffers(renderer, plane); + gbm_bo_unmap(bo, bo_data); + return wlr_drm_crtc_set_cursor(drm, crtc); } diff --git a/backend/egl.c b/backend/egl.c index 8bb05f6f..2ac1e77c 100644 --- a/backend/egl.c +++ b/backend/egl.c @@ -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; } diff --git a/include/backend/drm.h b/include/backend/drm.h index 9bdd79fd..0d1bc80d 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -36,6 +36,7 @@ struct wlr_drm_plane { float matrix[16]; struct wlr_renderer *wlr_rend; struct wlr_surface *wlr_surf; + struct gbm_bo *cursor_bo; union wlr_drm_plane_props props; }; -- cgit v1.2.3