diff options
author | Anton Kindestam <antonki@kth.se> | 2018-06-02 12:53:54 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2018-07-09 02:17:47 +0300 |
commit | 7beee68f8d8617557990a5f860d9d1f99c4ba009 (patch) | |
tree | 592bd1673b1edd902746e4bf39d9c7406d69f987 /video/out/drm_atomic.h | |
parent | 1298b9d201fc61cfffc6f82d78ae27fc294655b7 (diff) | |
download | mpv-7beee68f8d8617557990a5f860d9d1f99c4ba009.tar.bz2 mpv-7beee68f8d8617557990a5f860d9d1f99c4ba009.tar.xz |
context_drm_egl: Fix CRTC setup and release code when using atomic
The previous code did not save enough information about the old state,
and could end up changing what plane the fbcon:s FB got attached to,
or in worse case causing a blank screen (observed in some multi-screen
setups on Sandy Bridge).
In addition refactor the handling of drmModeModeInfo property blobs to
not leak, as well as enable reuse of already created blobs.
Diffstat (limited to 'video/out/drm_atomic.h')
-rw-r--r-- | video/out/drm_atomic.h | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/video/out/drm_atomic.h b/video/out/drm_atomic.h index 01246baf36..cd0252a767 100644 --- a/video/out/drm_atomic.h +++ b/video/out/drm_atomic.h @@ -19,11 +19,45 @@ #define MP_DRMATOMIC_H #include <stdlib.h> +#include <stdbool.h> #include <xf86drm.h> #include <xf86drmMode.h> #include "common/msg.h" +struct drm_mode { + drmModeModeInfo mode; + uint32_t blob_id; +}; + +struct drm_atomic_plane_state { + uint64_t fb_id; + uint64_t crtc_id; + uint64_t src_x; + uint64_t src_y; + uint64_t src_w; + uint64_t src_h; + uint64_t crtc_x; + uint64_t crtc_y; + uint64_t crtc_w; + uint64_t crtc_h; + uint64_t zpos; +}; + +// Used to store the restore state for VT switching and uninit +struct drm_atomic_state { + bool saved; + struct { + uint64_t crtc_id; + } connector; + struct { + struct drm_mode mode; + uint64_t active; + } crtc; + struct drm_atomic_plane_state osd_plane; + struct drm_atomic_plane_state video_plane; +}; + struct drm_object { int fd; uint32_t id; @@ -41,6 +75,8 @@ struct drm_atomic_context { struct drm_object *video_plane; drmModeAtomicReq *request; + + struct drm_atomic_state old_state; }; @@ -56,4 +92,10 @@ struct drm_atomic_context *drm_atomic_create_context(struct mp_log *log, int fd, int osd_plane_id, int video_plane_id); void drm_atomic_destroy_context(struct drm_atomic_context *ctx); +bool drm_atomic_save_old_state(struct drm_atomic_context *ctx); +bool drm_atomic_restore_old_state(drmModeAtomicReq *request, struct drm_atomic_context *ctx); + +bool drm_mode_ensure_blob(int fd, struct drm_mode *mode); +bool drm_mode_destroy_blob(int fd, struct drm_mode *mode); + #endif // MP_DRMATOMIC_H |