mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-24 06:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into refresh

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

5
include/backend/drm/drm.h
View file

@ -36,6 +36,10 @@ struct wlr_output_state {
uint32_t connector;
char name[16];
struct {
uint32_t dpms;
} props;
uint32_t width;
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_dpms(int fd, struct wlr_output_state *output, bool screen_on);
void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data);

2
include/wlr/backend/drm.h
View file

@ -10,6 +10,8 @@
struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
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_end(struct wlr_output *out);