[PATCH v3 xserver] modesetting: fix glamor ifdef
Mihail Konev
k.mvc at ya.ru
Sat Oct 15 04:13:43 UTC 2016
Add a missing ifdef needed for --disable-glamor.
Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
v2,3: edit description
Perhaps Regressed-in shouldn't be there.
hw/xfree86/drivers/modesetting/driver.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 216388f0a36c..3da69a3962a0 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -594,6 +594,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty, int *timeout)
PixmapSyncDirtyHelper(dirty);
if (!screen->isGPU) {
+#ifdef GLAMOR
/*
* When copying from the master framebuffer to the shared pixmap,
* we must ensure the copy is complete before the slave starts a
@@ -602,6 +603,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty, int *timeout)
*/
if (ms->drmmode.glamor)
glamor_finish(screen);
+#endif
/* Ensure the slave processes the damage immediately */
if (timeout)
*timeout = 0;
--
2.9.2
More information about the xorg-devel
mailing list