Changed logging.

This commit is contained in:
Scott Anderson 2017-05-02 13:00:25 +12:00
parent 41a82fd2fc
commit 562d43a5ec
5 changed files with 176 additions and 74 deletions

View File

@ -1,37 +1,42 @@
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <errno.h>
#include "backend/drm/backend.h" #include "backend/drm/backend.h"
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/event.h" #include "backend/drm/event.h"
#include "backend/drm/session.h" #include "backend/drm/session.h"
#include "backend/drm/udev.h" #include "backend/drm/udev.h"
#include "common/log.h"
struct wlr_drm_backend *wlr_drm_backend_init(void) struct wlr_drm_backend *wlr_drm_backend_init(void)
{ {
struct wlr_drm_backend *backend = calloc(1, sizeof *backend); struct wlr_drm_backend *backend = calloc(1, sizeof *backend);
if (!backend) if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL; return NULL;
}
if (!wlr_session_start(&backend->session)) { if (!wlr_session_start(&backend->session)) {
fprintf(stderr, "Could not create session\n"); wlr_log(L_ERROR, "Failed to start session");
goto error; goto error;
} }
if (!wlr_udev_init(&backend->udev)) { if (!wlr_udev_init(&backend->udev)) {
fprintf(stderr, "Could not start udev\n"); wlr_log(L_ERROR, "Failed to start udev");
goto error_session; goto error_session;
} }
backend->fd = wlr_udev_find_gpu(&backend->udev, &backend->session); backend->fd = wlr_udev_find_gpu(&backend->udev, &backend->session);
if (backend->fd == -1) { if (backend->fd == -1) {
fprintf(stderr, "Could not open GPU\n"); wlr_log(L_ERROR, "Failed to open DRM device");
goto error_udev; goto error_udev;
} }
if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) { if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) {
fprintf(stderr, "Could not initalise renderer\n"); wlr_log(L_ERROR, "Failed to initialize renderer");
goto error_fd; goto error_fd;
} }
@ -56,7 +61,7 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend)
return; return;
for (size_t i = 0; i < backend->display_len; ++i) { for (size_t i = 0; i < backend->display_len; ++i) {
wlr_drm_display_free(&backend->displays[i]); wlr_drm_display_free(&backend->displays[i], true);
} }
wlr_drm_renderer_free(&backend->renderer); wlr_drm_renderer_free(&backend->renderer);

View File

@ -1,7 +1,3 @@
#include "backend/drm/backend.h"
#include "backend/drm/drm.h"
#include "backend/drm/event.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -16,6 +12,11 @@
#include <gbm.h> #include <gbm.h>
#include <GLES3/gl3.h> #include <GLES3/gl3.h>
#include "backend/drm/backend.h"
#include "backend/drm/drm.h"
#include "backend/drm/event.h"
#include "common/log.h"
static const char *conn_name[] = { static const char *conn_name[] = {
[DRM_MODE_CONNECTOR_Unknown] = "Unknown", [DRM_MODE_CONNECTOR_Unknown] = "Unknown",
[DRM_MODE_CONNECTOR_VGA] = "VGA", [DRM_MODE_CONNECTOR_VGA] = "VGA",
@ -36,6 +37,44 @@ static const char *conn_name[] = {
[DRM_MODE_CONNECTOR_DSI] = "DSI", [DRM_MODE_CONNECTOR_DSI] = "DSI",
}; };
static const char *egl_error(void)
{
switch (eglGetError()) {
case EGL_SUCCESS:
return "Success";
case EGL_NOT_INITIALIZED:
return "Not initialized";
case EGL_BAD_ACCESS:
return "Bad access";
case EGL_BAD_ALLOC:
return "Bad alloc";
case EGL_BAD_ATTRIBUTE:
return "Bad attribute";
case EGL_BAD_CONTEXT:
return "Bad Context";
case EGL_BAD_CONFIG:
return "Bad Config";
case EGL_BAD_CURRENT_SURFACE:
return "Bad current surface";
case EGL_BAD_DISPLAY:
return "Bad display";
case EGL_BAD_SURFACE:
return "Bad surface";
case EGL_BAD_MATCH:
return "Bad match";
case EGL_BAD_PARAMETER:
return "Bad parameter";
case EGL_BAD_NATIVE_PIXMAP:
return "Bad native pixmap";
case EGL_BAD_NATIVE_WINDOW:
return "Bad native window";
case EGL_CONTEXT_LOST:
return "Context lost";
default:
return "Unknown";
}
}
// EGL extensions // EGL extensions
PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display; PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display;
PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface; PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC create_platform_window_surface;
@ -45,10 +84,20 @@ static bool egl_exts()
get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC) get_platform_display = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
eglGetProcAddress("eglGetPlatformDisplayEXT"); eglGetProcAddress("eglGetPlatformDisplayEXT");
if (!get_platform_display) {
wlr_log(L_ERROR, "Failed to load EGL extension 'eglGetPlatformDisplayEXT'");
return false;
}
create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC)
eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT");
return get_platform_display && create_platform_window_surface; if (!get_platform_display) {
wlr_log(L_ERROR, "Failed to load EGL extension 'eglCreatePlatformWindowSurfaceEXT'");
return false;
}
return true;
} }
static bool egl_get_config(EGLDisplay disp, EGLConfig *out) static bool egl_get_config(EGLDisplay disp, EGLConfig *out)
@ -88,35 +137,33 @@ static bool egl_get_config(EGLDisplay disp, EGLConfig *out)
bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer,
struct wlr_drm_backend *backend, int fd) struct wlr_drm_backend *backend, int fd)
{ {
if (!egl_exts()) { if (!egl_exts())
fprintf(stderr, "Could not get EGL extensions\n");
return false; return false;
}
renderer->gbm = gbm_create_device(fd); renderer->gbm = gbm_create_device(fd);
if (!renderer->gbm) { if (!renderer->gbm) {
fprintf(stderr, "Could not create gbm device: %s\n", strerror(errno)); wlr_log(L_ERROR, "Failed to create GBM device: %s", strerror(errno));
return false; return false;
} }
if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) { if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) {
fprintf(stderr, "Could not bind GLES3 API\n"); wlr_log(L_ERROR, "Failed to bind to the OpenGL ES API: %s", egl_error());
goto error_gbm; goto error_gbm;
} }
renderer->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL); renderer->egl.disp = get_platform_display(EGL_PLATFORM_GBM_MESA, renderer->gbm, NULL);
if (renderer->egl.disp == EGL_NO_DISPLAY) { if (renderer->egl.disp == EGL_NO_DISPLAY) {
fprintf(stderr, "Could not create EGL display\n"); wlr_log(L_ERROR, "Failed to create EGL display: %s", egl_error());
goto error_gbm; goto error_gbm;
} }
if (eglInitialize(renderer->egl.disp, NULL, NULL) == EGL_FALSE) { if (eglInitialize(renderer->egl.disp, NULL, NULL) == EGL_FALSE) {
fprintf(stderr, "Could not initalise EGL\n"); wlr_log(L_ERROR, "Failed to initialize EGL: %s", egl_error());
goto error_egl; goto error_egl;
} }
if (!egl_get_config(renderer->egl.disp, &renderer->egl.conf)) { if (!egl_get_config(renderer->egl.disp, &renderer->egl.conf)) {
fprintf(stderr, "Could not get EGL config\n"); wlr_log(L_ERROR, "Failed to get EGL config");
goto error_egl; goto error_egl;
} }
@ -126,7 +173,7 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer,
renderer->egl.conf, EGL_NO_CONTEXT, attribs); renderer->egl.conf, EGL_NO_CONTEXT, attribs);
if (renderer->egl.context == EGL_NO_CONTEXT) { if (renderer->egl.context == EGL_NO_CONTEXT) {
fprintf(stderr, "Could not create EGL context\n"); wlr_log(L_ERROR, "Failed to create EGL context: %s", egl_error());
goto error_egl; goto error_egl;
} }
@ -162,16 +209,20 @@ void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer)
void wlr_drm_scan_connectors(struct wlr_drm_backend *backend) void wlr_drm_scan_connectors(struct wlr_drm_backend *backend)
{ {
drmModeRes *res = drmModeGetResources(backend->fd); drmModeRes *res = drmModeGetResources(backend->fd);
if (!res) if (!res) {
wlr_log(L_ERROR, "Failed to get DRM resources");
return; return;
}
// I don't know if this needs to be allocated with realloc like this, // I don't know if this needs to be allocated with realloc like this,
// as it may not even be possible for the number of connectors to change. // as it may not even be possible for the number of connectors to change.
// I'll just have to see how DisplayPort MST works with DRM. // I'll just have to see how DisplayPort MST works with DRM.
if ((size_t)res->count_connectors > backend->display_len) { if ((size_t)res->count_connectors > backend->display_len) {
struct wlr_drm_display *new = realloc(backend->displays, sizeof *new * res->count_connectors); struct wlr_drm_display *new = realloc(backend->displays, sizeof *new * res->count_connectors);
if (!new) if (!new) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error; goto error;
}
for (int i = backend->display_len; i < res->count_connectors; ++i) { for (int i = backend->display_len; i < res->count_connectors; ++i) {
new[i] = (struct wlr_drm_display) { new[i] = (struct wlr_drm_display) {
@ -206,6 +257,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *backend)
} else if (disp->state == DRM_DISP_CONNECTED && } else if (disp->state == DRM_DISP_CONNECTED &&
conn->connection != DRM_MODE_CONNECTED) { conn->connection != DRM_MODE_CONNECTED) {
disp->state = DRM_DISP_DISCONNECTED; disp->state = DRM_DISP_DISCONNECTED;
wlr_drm_display_free(disp, false);
wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM);
} }
@ -234,8 +286,10 @@ static uint32_t get_fb_for_bo(int fd, struct gbm_bo *bo)
return *id; return *id;
id = calloc(1, sizeof *id); id = calloc(1, sizeof *id);
if (!id) if (!id) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return 0; return 0;
}
drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32, drmModeAddFB(fd, gbm_bo_get_width(bo), gbm_bo_get_height(bo), 24, 32,
gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id); gbm_bo_get_stride(bo), gbm_bo_get_handle(bo).u32, id);
@ -254,13 +308,19 @@ static bool display_init_renderer(struct wlr_drm_renderer *renderer,
disp->width, disp->height, disp->width, disp->height,
GBM_FORMAT_XRGB8888, GBM_FORMAT_XRGB8888,
GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
if (!disp->gbm) if (!disp->gbm) {
wlr_log(L_ERROR, "Failed to create GBM surface for %s: %s", disp->name,
strerror(errno));
return false; return false;
}
disp->egl = create_platform_window_surface(renderer->egl.disp, renderer->egl.conf, disp->egl = create_platform_window_surface(renderer->egl.disp, renderer->egl.conf,
disp->gbm, NULL); disp->gbm, NULL);
if (disp->egl == EGL_NO_SURFACE) if (disp->egl == EGL_NO_SURFACE) {
wlr_log(L_ERROR, "Failed to create EGL surface for %s: %s", disp->name,
egl_error());
return false; return false;
}
// Render black frame // Render black frame
@ -294,7 +354,7 @@ static drmModeModeInfo *select_mode(size_t num_modes,
if (strcmp(str, "current") == 0) { if (strcmp(str, "current") == 0) {
if (!old_crtc) { if (!old_crtc) {
fprintf(stderr, "Display does not have currently configured mode\n"); wlr_log(L_ERROR, "Display does not have currently configured mode");
return NULL; return NULL;
} }
@ -313,7 +373,7 @@ static drmModeModeInfo *select_mode(size_t num_modes,
int ret; int ret;
if ((ret = sscanf(str, "%ux%u@%u", &width, &height, &rate)) != 2 && ret != 3) { if ((ret = sscanf(str, "%ux%u@%u", &width, &height, &rate)) != 2 && ret != 3) {
fprintf(stderr, "Invalid modesetting string\n"); wlr_log(L_ERROR, "Invalid modesetting string '%s'", str);
return NULL; return NULL;
} }
@ -324,22 +384,40 @@ static drmModeModeInfo *select_mode(size_t num_modes,
return &modes[i]; return &modes[i];
} }
wlr_log(L_ERROR, "Unable to find mode %ux%u@%u", width, height, rate);
return NULL; return NULL;
} }
bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, bool wlr_drm_display_modeset(struct wlr_drm_backend *backend,
struct wlr_drm_display *disp, const char *str) struct wlr_drm_display *disp, const char *str)
{ {
wlr_log(L_INFO, "Modesetting %s with '%s'", disp->name, str);
drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector); drmModeConnector *conn = drmModeGetConnector(backend->fd, disp->connector);
if (!conn || conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) if (!conn) {
wlr_log(L_ERROR, "Failed to get DRM connector");
goto error; goto error;
}
if (conn->connection != DRM_MODE_CONNECTED || conn->count_modes == 0) {
wlr_log(L_ERROR, "%s is not connected", disp->name);
goto error;
}
disp->num_modes = conn->count_modes; disp->num_modes = conn->count_modes;
disp->modes = malloc(sizeof *disp->modes * disp->num_modes); disp->modes = malloc(sizeof *disp->modes * disp->num_modes);
if (!disp->modes) if (!disp->modes) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error; goto error;
}
memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes); memcpy(disp->modes, conn->modes, sizeof *disp->modes * disp->num_modes);
wlr_log(L_INFO, "Detected modes:");
for (size_t i = 0; i < disp->num_modes; ++i)
wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32,
disp->modes[i].hdisplay, disp->modes[i].vdisplay,
disp->modes[i].vrefresh);
drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id); drmModeEncoder *curr_enc = drmModeGetEncoder(backend->fd, conn->encoder_id);
if (curr_enc) { if (curr_enc) {
disp->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id); disp->old_crtc = drmModeGetCrtc(backend->fd, curr_enc->crtc_id);
@ -348,17 +426,15 @@ bool wlr_drm_display_modeset(struct wlr_drm_backend *backend,
disp->active_mode = select_mode(disp->num_modes, disp->modes, disp->old_crtc, str); disp->active_mode = select_mode(disp->num_modes, disp->modes, disp->old_crtc, str);
if (!disp->active_mode) { if (!disp->active_mode) {
fprintf(stderr, "Could not find mode '%s' for %s\n", str, disp->name); wlr_log(L_ERROR, "Failed to configure %s", disp->name);
goto error; goto error;
} }
fprintf(stderr, "Configuring %s with mode %ux%u@%u\n",
disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay,
disp->active_mode->vrefresh);
drmModeRes *res = drmModeGetResources(backend->fd); drmModeRes *res = drmModeGetResources(backend->fd);
if (!res) if (!res) {
wlr_log(L_ERROR, "Failed to get DRM resources");
goto error; goto error;
}
bool success = false; bool success = false;
for (int i = 0; !success && i < conn->count_encoders; ++i) { for (int i = 0; !success && i < conn->count_encoders; ++i) {
@ -384,21 +460,33 @@ bool wlr_drm_display_modeset(struct wlr_drm_backend *backend,
drmModeFreeResources(res); drmModeFreeResources(res);
if (!success) if (!success) {
wlr_log(L_ERROR, "Failed to find CRTC for %s", disp->name);
goto error; goto error;
}
disp->state = DRM_DISP_CONNECTED; disp->state = DRM_DISP_CONNECTED;
drmModeFreeConnector(conn);
disp->width = disp->active_mode->hdisplay; disp->width = disp->active_mode->hdisplay;
disp->height = disp->active_mode->vdisplay; disp->height = disp->active_mode->vdisplay;
display_init_renderer(&backend->renderer, disp); if (!display_init_renderer(&backend->renderer, disp)) {
wlr_log(L_ERROR, "Failed to initalise renderer for %s", disp->name);
goto error;
}
drmModeFreeConnector(conn);
wlr_log(L_INFO, "Configuring %s with mode %"PRIu16"x%"PRIu16"@%"PRIu32"\n",
disp->name, disp->active_mode->hdisplay, disp->active_mode->vdisplay,
disp->active_mode->vrefresh);
return true; return true;
error: error:
disp->state = DRM_DISP_DISCONNECTED; disp->state = DRM_DISP_DISCONNECTED;
drmModeFreeConnector(conn); drmModeFreeConnector(conn);
free(disp->modes);
wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM); wlr_drm_add_event(backend, disp, DRM_EV_DISPLAY_REM);
@ -418,13 +506,22 @@ static void page_flip_handler(int fd,
wlr_drm_add_event(disp->renderer->backend, disp, DRM_EV_RENDER); wlr_drm_add_event(disp->renderer->backend, disp, DRM_EV_RENDER);
} }
void wlr_drm_display_free(struct wlr_drm_display *disp) void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore)
{ {
if (!disp || disp->state != DRM_DISP_CONNECTED) if (!disp || disp->state != DRM_DISP_CONNECTED)
return; return;
struct wlr_drm_renderer *renderer = disp->renderer; struct wlr_drm_renderer *renderer = disp->renderer;
eglDestroySurface(renderer->egl.disp, disp->egl);
gbm_surface_destroy(disp->gbm);
free(disp->modes);
disp->state = DRM_DISP_DISCONNECTED;
if (!restore)
return;
drmModeCrtc *crtc = disp->old_crtc; drmModeCrtc *crtc = disp->old_crtc;
if (crtc) { if (crtc) {
// Wait for exising page flips to finish // Wait for exising page flips to finish
@ -443,11 +540,6 @@ void wlr_drm_display_free(struct wlr_drm_display *disp)
1, &crtc->mode); 1, &crtc->mode);
drmModeFreeCrtc(crtc); drmModeFreeCrtc(crtc);
} }
eglDestroySurface(renderer->egl.disp, disp->egl);
gbm_surface_destroy(disp->gbm);
free(disp->modes);
} }
void wlr_drm_event(int fd) void wlr_drm_event(int fd)

View File

@ -4,6 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <systemd/sd-bus.h> #include <systemd/sd-bus.h>
#include <systemd/sd-login.h> #include <systemd/sd-login.h>
#include <unistd.h> #include <unistd.h>
@ -13,6 +14,7 @@
#include "backend/drm/backend.h" #include "backend/drm/backend.h"
#include "backend/drm/session.h" #include "backend/drm/session.h"
#include "common/log.h"
int wlr_session_take_device(struct wlr_session *restrict session, int wlr_session_take_device(struct wlr_session *restrict session,
const char *restrict path, const char *restrict path,
@ -25,7 +27,7 @@ int wlr_session_take_device(struct wlr_session *restrict session,
struct stat st; struct stat st;
if (stat(path, &st) < 0) { if (stat(path, &st) < 0) {
fprintf(stderr, "Failed to stat '%s'\n", path); wlr_log(L_ERROR, "Failed to stat '%s'", path);
return -1; return -1;
} }
@ -37,20 +39,26 @@ int wlr_session_take_device(struct wlr_session *restrict session,
&error, &msg, &error, &msg,
"uu", major(st.st_rdev), minor(st.st_rdev)); "uu", major(st.st_rdev), minor(st.st_rdev));
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "%s\n", error.message); wlr_log(L_ERROR, "Failed to take device '%s': %s", path, error.message);
goto error; goto error;
} }
int paused = 0; int paused = 0;
ret = sd_bus_message_read(msg, "hb", &fd, &paused); ret = sd_bus_message_read(msg, "hb", &fd, &paused);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "%s\n", strerror(-ret)); wlr_log(L_ERROR, "Failed to parse DBus response for '%s': %s",
path, strerror(-ret));
goto error; goto error;
} }
// The original fd seem to be closed when the message is freed // The original fd seem to be closed when the message is freed
// so we just clone it. // so we just clone it.
fd = fcntl(fd, F_DUPFD_CLOEXEC, 0); fd = fcntl(fd, F_DUPFD_CLOEXEC, 0);
if (fd == -1) {
wlr_log(L_ERROR, "Failed to clone file descriptor for '%s': %s",
path, strerror(errno));
goto error;
}
if (paused_out) if (paused_out)
*paused_out = paused; *paused_out = paused;
@ -69,7 +77,7 @@ void wlr_session_release_device(struct wlr_session *session, int fd)
struct stat st; struct stat st;
if (fstat(fd, &st) < 0) { if (fstat(fd, &st) < 0) {
fprintf(stderr, "Could not stat fd %d\n", fd); wlr_log(L_ERROR, "Failed to stat device '%d'", fd);
return; return;
} }
@ -80,9 +88,8 @@ void wlr_session_release_device(struct wlr_session *session, int fd)
"ReleaseDevice", "ReleaseDevice",
&error, &msg, &error, &msg,
"uu", major(st.st_rdev), minor(st.st_rdev)); "uu", major(st.st_rdev), minor(st.st_rdev));
if (ret < 0) { if (ret < 0)
/* Log something */; wlr_log(L_ERROR, "Failed to release device '%d'", fd);
}
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
@ -101,9 +108,8 @@ static bool session_activate(struct wlr_session *session)
"Activate", "Activate",
&error, &msg, &error, &msg,
""); "");
if (ret < 0) { if (ret < 0)
fprintf(stderr, "%s\n", error.message); wlr_log(L_ERROR, "Failed to activate session");
}
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
@ -123,9 +129,8 @@ static bool take_control(struct wlr_session *session)
"TakeControl", "TakeControl",
&error, &msg, &error, &msg,
"b", false); "b", false);
if (ret < 0) { if (ret < 0)
/* Log something */; wlr_log(L_ERROR, "Failed to take control of session");
}
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
@ -145,9 +150,8 @@ static void release_control(struct wlr_session *session)
"ReleaseControl", "ReleaseControl",
&error, &msg, &error, &msg,
""); "");
if (ret < 0) { if (ret < 0)
/* Log something */; wlr_log(L_ERROR, "Failed to release control of session");
}
sd_bus_error_free(&error); sd_bus_error_free(&error);
sd_bus_message_unref(msg); sd_bus_message_unref(msg);
@ -169,13 +173,13 @@ bool wlr_session_start(struct wlr_session *session)
ret = sd_pid_get_session(getpid(), &session->id); ret = sd_pid_get_session(getpid(), &session->id);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Could not get session\n"); wlr_log(L_ERROR, "Failed to get session id: %s", strerror(-ret));
goto error; goto error;
} }
ret = sd_session_get_seat(session->id, &session->seat); ret = sd_session_get_seat(session->id, &session->seat);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Could not get seat\n"); wlr_log(L_ERROR, "Failed to get seat id: %s", strerror(-ret));
goto error; goto error;
} }
@ -192,19 +196,15 @@ bool wlr_session_start(struct wlr_session *session)
ret = sd_bus_open_system(&session->bus); ret = sd_bus_open_system(&session->bus);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Could not open bus\n"); wlr_log(L_ERROR, "Failed to open DBus connection: %s", strerror(-ret));
goto error; goto error;
} }
if (!session_activate(session)) { if (!session_activate(session))
fprintf(stderr, "Could not activate session\n");
goto error_bus; goto error_bus;
}
if (!take_control(session)) { if (!take_control(session))
fprintf(stderr, "Could not take control of session\n");
goto error_bus; goto error_bus;
}
return true; return true;

View File

@ -12,6 +12,7 @@
#include "backend/drm/udev.h" #include "backend/drm/udev.h"
#include "backend/drm/session.h" #include "backend/drm/session.h"
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "common/log.h"
static bool device_is_kms(struct wlr_udev *udev, static bool device_is_kms(struct wlr_udev *udev,
struct wlr_session *session, struct wlr_session *session,
@ -59,8 +60,10 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session)
int fd = -1; int fd = -1;
struct udev_enumerate *en = udev_enumerate_new(udev->udev); struct udev_enumerate *en = udev_enumerate_new(udev->udev);
if (!en) if (!en) {
wlr_log(L_ERROR, "Failed to create udev enumeration");
return -1; return -1;
}
udev_enumerate_add_match_subsystem(en, "drm"); udev_enumerate_add_match_subsystem(en, "drm");
udev_enumerate_add_match_sysname(en, "card[0-9]*"); udev_enumerate_add_match_sysname(en, "card[0-9]*");
@ -84,8 +87,7 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session)
} }
struct udev_device *pci = struct udev_device *pci =
udev_device_get_parent_with_subsystem_devtype(dev, udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL);
"pci", NULL);
if (pci) { if (pci) {
const char *id = udev_device_get_sysattr_value(pci, "boot_vga"); const char *id = udev_device_get_sysattr_value(pci, "boot_vga");
@ -117,11 +119,14 @@ int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session)
bool wlr_udev_init(struct wlr_udev *udev) bool wlr_udev_init(struct wlr_udev *udev)
{ {
udev->udev = udev_new(); udev->udev = udev_new();
if (!udev->udev) if (!udev->udev) {
wlr_log(L_ERROR, "Failed to create udev context");
return false; return false;
}
udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev"); udev->mon = udev_monitor_new_from_netlink(udev->udev, "udev");
if (!udev->mon) { if (!udev->mon) {
wlr_log(L_ERROR, "Failed to create udev monitor");
udev_unref(udev->udev); udev_unref(udev->udev);
return false; return false;
} }

View File

@ -59,7 +59,7 @@ struct wlr_drm_display {
bool wlr_drm_display_modeset(struct wlr_drm_backend *backend, bool wlr_drm_display_modeset(struct wlr_drm_backend *backend,
struct wlr_drm_display *disp, const char *str); struct wlr_drm_display *disp, const char *str);
void wlr_drm_display_free(struct wlr_drm_display *disp); void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore);
void wlr_drm_display_begin(struct wlr_drm_display *disp); void wlr_drm_display_begin(struct wlr_drm_display *disp);
void wlr_drm_display_end(struct wlr_drm_display *disp); void wlr_drm_display_end(struct wlr_drm_display *disp);