Merge branch 'master' into refresh

1 files changed, 5 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);