aboutsummaryrefslogtreecommitdiff
path: root/include/backend
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-09-27 07:58:01 -0400
committerGitHub <noreply@github.com>2017-09-27 07:58:01 -0400
commitd7d73cd2985d4c5d1fdadcfb63680c638e29a4a0 (patch)
tree3004cea696ad6278bae920bec2adf0f1aa1dc552 /include/backend
parent80a1cc01e9e13badd1596427a5a6d69ef53ab56c (diff)
parentc8c5aedaa21e7b8c0a47761a987ab5770b674f0b (diff)
Merge pull request #144 from ascent12/drm-dp-mst
DisplayPort MST
Diffstat (limited to 'include/backend')
-rw-r--r--include/backend/drm.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/backend/drm.h b/include/backend/drm.h
index 122d49ef..b474e8b3 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -127,6 +127,7 @@ struct wlr_drm_backend {
enum wlr_drm_output_state {
WLR_DRM_OUTPUT_DISCONNECTED,
WLR_DRM_OUTPUT_NEEDS_MODESET,
+ WLR_DRM_OUTPUT_CLEANUP,
WLR_DRM_OUTPUT_CONNECTED,
};
@@ -154,6 +155,7 @@ struct wlr_drm_output {
struct wlr_drm_renderer *renderer;
bool pageflip_pending;
+ struct wl_event_source *retry_pageflip;
};
// Used to provide atomic or legacy DRM functions
@@ -176,8 +178,8 @@ struct wlr_drm_interface {
bool wlr_drm_check_features(struct wlr_drm_backend *drm);
bool wlr_drm_resources_init(struct wlr_drm_backend *drm);
void wlr_drm_resources_free(struct wlr_drm_backend *drm);
-void wlr_drm_output_cleanup(struct wlr_drm_output *output, bool restore);
-
+void wlr_drm_restore_outputs(struct wlr_drm_backend *drm);
+void wlr_drm_output_cleanup(struct wlr_drm_output *output);
void wlr_drm_scan_connectors(struct wlr_drm_backend *state);
int wlr_drm_event(int fd, uint32_t mask, void *data);