xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Tue Jan 5 10:28:40 PST 2016
hw/xfree86/drivers/modesetting/present.c | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit fe8562f5316d8c74ca074ad145295c65ddff5fc2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Fri Jan 1 18:10:08 2016 -0800
modesetting should not reference gbm when it's not defined
Fixes build errors of:
present.c: In function 'ms_do_pageflip':
present.c:410:17: error: 'drmmode_bo' has no member named 'gbm'
new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front);
^
present.c:412:22: error: 'drmmode_bo' has no member named 'gbm'
if (!new_front_bo.gbm) {
^
present.c: In function 'ms_present_check_flip':
present.c:536:36: error: 'drmmode_bo' has no member named 'gbm'
if (drmmode_crtc->rotate_bo.gbm)
^
Introduced by commit 13c7d53d
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
index bb2976b..d65c8c8 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -398,6 +398,9 @@ ms_do_pageflip(ScreenPtr screen,
int ref_crtc_vblank_pipe,
Bool async)
{
+#ifndef GLAMOR_HAS_GBM
+ return FALSE;
+#else
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
modesettingPtr ms = modesettingPTR(scrn);
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -505,6 +508,7 @@ error_out:
flipdata->flip_count--;
return FALSE;
+#endif /* GLAMOR_HAS_GBM */
}
/*
@@ -533,8 +537,10 @@ ms_present_check_flip(RRCrtcPtr crtc,
drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private;
/* Don't do pageflipping if CRTCs are rotated. */
+#ifdef GLAMOR_HAS_GBM
if (drmmode_crtc->rotate_bo.gbm)
return FALSE;
+#endif
if (ms_crtc_on(config->crtc[i]))
num_crtcs_on++;
More information about the xorg-commit
mailing list