summaryrefslogtreecommitdiff
path: root/src/drmmode_display.h
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2018-10-24 18:14:02 +0200
committerMichel Dänzer <michel.daenzer@amd.com>2018-10-24 18:14:02 +0200
commit86fe8d27b9a3f043e5288ce50eaf1f5fffd24516 (patch)
treed29c4745bf8bd82cdd940b4ba134af88470597d7 /src/drmmode_display.h
parentf892d3791219d1041e0cbb1b866e15774004aa18 (diff)
Handle pending scanout update in drmmode_crtc_scanout_free
We have to wait for a pending scanout flip or abort a pending scanout update, otherwise the corresponding event handler will likely crash after drmmode_crtc_scanout_free cleaned up the data structures. Fixes crash after VT switch while dedicated scanout pixmaps are enabled for any CRTC. (Ported from amdgpu commit 0cd2c337d2c02b8ec2bd994d6124b4aaaad10741)
Diffstat (limited to 'src/drmmode_display.h')
-rw-r--r--src/drmmode_display.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index bc66eda6..bfc13010 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -215,7 +215,7 @@ extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);
extern void drmmode_crtc_scanout_destroy(drmmode_ptr drmmode,
struct drmmode_scanout *scanout);
-void drmmode_crtc_scanout_free(drmmode_crtc_private_ptr drmmode_crtc);
+void drmmode_crtc_scanout_free(xf86CrtcPtr crtc);
PixmapPtr drmmode_crtc_scanout_create(xf86CrtcPtr crtc,
struct drmmode_scanout *scanout,
int width, int height);