diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:25:34 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:25:34 -0400 |
| commit | 7cf4ee128e278108b0326344be01ded93ce7148b (patch) | |
| tree | c5d7291b1aebf130c701af6936c7cc5614383c45 /include | |
| parent | 38bb3b960852f9e358ec40c516f99eafeaf83ab2 (diff) | |
| parent | d7d73cd2985d4c5d1fdadcfb63680c638e29a4a0 (diff) | |
Merge remote-tracking branch 'origin/master' into rootston
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm.h | 6 |
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); |