Working commit

This commit is contained in:
Scott Anderson 2017-05-14 01:12:47 +12:00
parent c88f252580
commit 058b8bdf27
10 changed files with 133 additions and 13 deletions

View file

@ -37,6 +37,29 @@ static struct wlr_backend_impl backend_impl = {
.destroy = wlr_drm_backend_destroy
};
static void device_paused(struct wl_listener *listener, void *data) {
struct wlr_backend_state *backend = wl_container_of(listener, backend, device_paused);
// TODO: Actually pause the renderer or something.
// We currently just expect it to fail its next pageflip.
(void)backend;
}
static void device_resumed(struct wl_listener *listener, void *data) {
struct wlr_backend_state *drm = wl_container_of(listener, drm, device_paused);
int *new_fd = data;
close(drm->fd);
drm->fd = *new_fd;
drm->renderer.fd = *new_fd;
for (size_t i = 0; i < drm->outputs->length; ++i) {
struct wlr_output_state *output = drm->outputs->items[i];
wlr_drm_output_draw_blank(output);
}
}
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
struct wlr_session *session) {
struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state));
@ -79,6 +102,15 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
goto error_fd;
}
wl_list_init(&state->device_paused.link);
wl_list_init(&state->device_paused.link);
state->device_paused.notify = device_paused;
state->device_resumed.notify = device_resumed;
wl_signal_add(&session->device_paused, &state->device_paused);
wl_signal_add(&session->device_resumed, &state->device_resumed);
// TODO: what is the difference between the per-output renderer and this
// one?
if (!wlr_drm_renderer_init(&state->renderer, state->fd)) {

View file

@ -474,3 +474,31 @@ void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on
DRM_MODE_DPMS_STANDBY);
}
}
void wlr_drm_output_draw_blank(struct wlr_output_state *output) {
if (output->state != DRM_OUTPUT_CONNECTED) {
return;
}
struct wlr_drm_renderer *renderer = output->renderer;
eglMakeCurrent(renderer->egl.display, output->egl, output->egl, renderer->egl.context);
glViewport(0, 0, output->width, output->height);
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
eglSwapBuffers(renderer->egl.display, output->egl);
struct gbm_bo *bo = gbm_surface_lock_front_buffer(output->gbm);
uint32_t fb_id = get_fb_for_bo(renderer->fd, bo);
drmModeSetCrtc(renderer->fd, output->crtc, fb_id, 0, 0,
&output->connector, 1, &output->wlr_output->current_mode->state->mode);
drmModePageFlip(renderer->fd, output->crtc, fb_id,
DRM_MODE_PAGE_FLIP_EVENT, output);
gbm_surface_release_buffer(output->gbm, bo);
wlr_log(L_INFO, "Drew blank frame");
}