diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2017-08-03 17:51:20 +0900 |
---|---|---|
committer | Michel Dänzer <michel@daenzer.net> | 2017-08-17 15:42:45 +0900 |
commit | e6d7dc2070f4d21a6900916bb70a31839112882c (patch) | |
tree | ea3ce0e1c69ad437577e02e76dc8d831d576da58 /src/drmmode_display.h | |
parent | f87acdbfb1b0b6d2769764772a52ea8b81675e20 (diff) |
Wait for pending flips synchronously before turning off a CRTC
Allows removing drmmode_clear_pending_flip and the pending_dpms_mode
field and cleaning up the code considerably.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/drmmode_display.h')
-rw-r--r-- | src/drmmode_display.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/drmmode_display.h b/src/drmmode_display.h index 71d1c4a4..52b76f05 100644 --- a/src/drmmode_display.h +++ b/src/drmmode_display.h @@ -92,8 +92,6 @@ typedef struct { PixmapPtr prime_scanout_pixmap; int dpms_mode; - /* For when a flip is pending when DPMS off requested */ - int pending_dpms_mode; CARD64 dpms_last_ust; uint32_t dpms_last_seq; int dpms_last_fps; @@ -145,7 +143,7 @@ drmmode_crtc_can_flip(xf86CrtcPtr crtc) drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; return crtc->enabled && - drmmode_crtc->pending_dpms_mode == DPMSModeOn && + drmmode_crtc->dpms_mode == DPMSModeOn && !drmmode_crtc->rotate.bo && !drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo; } @@ -215,7 +213,6 @@ extern int drmmode_get_crtc_id(xf86CrtcPtr crtc); extern int drmmode_get_height_align(ScrnInfoPtr scrn, uint32_t tiling); extern int drmmode_get_pitch_align(ScrnInfoPtr scrn, int bpe, uint32_t tiling); extern int drmmode_get_base_align(ScrnInfoPtr scrn, int bpe, uint32_t tiling); -extern void drmmode_clear_pending_flip(xf86CrtcPtr crtc); Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, PixmapPtr new_front, uint64_t id, void *data, |