summaryrefslogtreecommitdiff
path: root/xserver/hw/xfree86/drivers/modesetting/present.c
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2021-09-03 13:19:16 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2021-09-03 13:19:16 +0000
commit9b652580565e960bd497459fbf8f8baffb64d726 (patch)
treefc4b94130ced7fddea8a744ddaf4f5608885e256 /xserver/hw/xfree86/drivers/modesetting/present.c
parent595f95ad32a0d11859017ff1f97e17b5bf1ea25b (diff)
Update to xserver 1.20.13.
Diffstat (limited to 'xserver/hw/xfree86/drivers/modesetting/present.c')
-rw-r--r--xserver/hw/xfree86/drivers/modesetting/present.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xserver/hw/xfree86/drivers/modesetting/present.c b/xserver/hw/xfree86/drivers/modesetting/present.c
index 009a0790c..186309a29 100644
--- a/xserver/hw/xfree86/drivers/modesetting/present.c
+++ b/xserver/hw/xfree86/drivers/modesetting/present.c
@@ -244,7 +244,7 @@ ms_present_check_unflip(RRCrtcPtr crtc,
if (drmmode_crtc->rotate_bo.gbm)
return FALSE;
- if (ms_crtc_on(config->crtc[i]))
+ if (xf86_crtc_on(config->crtc[i]))
num_crtcs_on++;
}
@@ -257,6 +257,9 @@ ms_present_check_unflip(RRCrtcPtr crtc,
pixmap->devKind != drmmode_bo_get_pitch(&ms->drmmode.front_bo))
return FALSE;
+ if (!ms->drmmode.glamor)
+ return FALSE;
+
#ifdef GBM_BO_WITH_MODIFIERS
/* Check if buffer format/modifier is supported by all active CRTCs */
gbm = glamor_gbm_bo_from_pixmap(screen, pixmap);