Merge branch 'master' into refresh

This commit is contained in:
Scott Anderson 2017-05-14 01:24:09 +12:00
commit eac603bfdf
5 changed files with 80 additions and 1 deletions

View file

@ -101,3 +101,11 @@ error_backend:
free(backend); free(backend);
return NULL; return NULL;
} }
void wlr_drm_backend_dpms(struct wlr_backend *backend, bool screen_on) {
struct wlr_backend_state *state = backend->state;
for (size_t i = 0; i < state->outputs->length; ++i) {
struct wlr_output_state *output = state->outputs->items[i];
wlr_drm_output_dpms(state->fd, output, screen_on);
}
}

View file

@ -263,6 +263,30 @@ static uint32_t calculate_refresh_rate(drmModeModeInfo *mode) {
return refresh; return refresh;
} }
static void scan_property_ids(int fd, drmModeConnector *conn,
struct wlr_output_state *output) {
for (int i = 0; i < conn->count_props; ++i) {
drmModePropertyRes *prop = drmModeGetProperty(fd, conn->props[i]);
if (!prop) {
continue;
}
// I think this is guranteed to exist
if (strcmp(prop->name, "DPMS") == 0) {
output->props.dpms = prop->prop_id;
/* There may be more properties we want to get,
* but since it's currently only this, we exit early
*/
drmModeFreeProperty(prop);
break;
}
drmModeFreeProperty(prop);
}
}
void wlr_drm_scan_connectors(struct wlr_backend_state *state) { void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
wlr_log(L_INFO, "Scanning DRM connectors"); wlr_log(L_INFO, "Scanning DRM connectors");
@ -314,6 +338,8 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
free(curr_enc); free(curr_enc);
} }
scan_property_ids(state->fd, conn, output);
list_add(state->outputs, output); list_add(state->outputs, output);
wlr_log(L_INFO, "Found display '%s'", output->name); wlr_log(L_INFO, "Found display '%s'", output->name);
} else { } else {
@ -428,3 +454,23 @@ void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore) {
} }
// TODO: free wlr_output // TODO: free wlr_output
} }
void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on) {
if (output->state != DRM_OUTPUT_CONNECTED) {
return;
}
if (screen_on) {
drmModeConnectorSetProperty(fd, output->connector, output->props.dpms,
DRM_MODE_DPMS_ON);
// Start rendering loop again by drawing a black frame
wlr_drm_output_begin(output->wlr_output);
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
wlr_drm_output_end(output->wlr_output);
} else {
drmModeConnectorSetProperty(fd, output->connector, output->props.dpms,
DRM_MODE_DPMS_STANDBY);
}
}

View file

@ -81,6 +81,18 @@ int timer_done(void *data) {
return 1; return 1;
} }
int dpms_on(void *data) {
struct wlr_backend *backend = data;
wlr_drm_backend_dpms(backend, false);
return 1;
}
int dpms_off(void *data) {
struct wlr_backend *backend = data;
wlr_drm_backend_dpms(backend, true);
return 1;
}
int main() { int main() {
if (getenv("DISPLAY")) { if (getenv("DISPLAY")) {
fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n"); fprintf(stderr, "Detected that X is running. Run this in its own virtual terminal.\n");
@ -120,8 +132,14 @@ int main() {
bool done = false; bool done = false;
struct wl_event_source *timer = wl_event_loop_add_timer(event_loop, struct wl_event_source *timer = wl_event_loop_add_timer(event_loop,
timer_done, &done); timer_done, &done);
struct wl_event_source *timer_dpms_on = wl_event_loop_add_timer(event_loop,
dpms_on, wlr);
struct wl_event_source *timer_dpms_off = wl_event_loop_add_timer(event_loop,
dpms_off, wlr);
wl_event_source_timer_update(timer, 5000); wl_event_source_timer_update(timer, 20000);
wl_event_source_timer_update(timer_dpms_on, 5000);
wl_event_source_timer_update(timer_dpms_off, 10000);
while (!done) { while (!done) {
wl_event_loop_dispatch(event_loop, 0); wl_event_loop_dispatch(event_loop, 0);

View file

@ -36,6 +36,10 @@ struct wlr_output_state {
uint32_t connector; uint32_t connector;
char name[16]; char name[16];
struct {
uint32_t dpms;
} props;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
@ -51,6 +55,7 @@ struct wlr_output_state {
}; };
void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore); void wlr_drm_output_cleanup(struct wlr_output_state *output, bool restore);
void wlr_drm_output_dpms(int fd, struct wlr_output_state *output, bool screen_on);
void wlr_drm_scan_connectors(struct wlr_backend_state *state); void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data); int wlr_drm_event(int fd, uint32_t mask, void *data);

View file

@ -10,6 +10,8 @@
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
struct wlr_session *session); struct wlr_session *session);
void wlr_drm_backend_dpms(struct wlr_backend *backend, bool screen_on);
void wlr_drm_output_begin(struct wlr_output *out); void wlr_drm_output_begin(struct wlr_output *out);
void wlr_drm_output_end(struct wlr_output *out); void wlr_drm_output_end(struct wlr_output *out);