diff options
| author | Scott Anderson <ascent12@hotmail.com> | 2017-05-14 01:24:09 +1200 |
|---|---|---|
| committer | Scott Anderson <ascent12@hotmail.com> | 2017-05-14 01:24:09 +1200 |
| commit | eac603bfdf107daa1bb33568c8cc282713c31edd (patch) | |
| tree | fe3752518a62f96f970ea98478150f96ca612b2e /include | |
| parent | 3000b8615fd4ba62b1a0f804caf0b150d5edf22c (diff) | |
| parent | 599d1bcbdc8e0e9fb2d743d70dbf8b6fa9f3bea2 (diff) | |
| download | wlroots-eac603bfdf107daa1bb33568c8cc282713c31edd.tar.xz | |
Merge branch 'master' into refresh
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm/drm.h | 5 | ||||
| -rw-r--r-- | include/wlr/backend/drm.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 4b42aa68..93de4fb8 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -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); diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index 2d9bf879..c76d280a 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -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); |