From 378c85a8848679eaa3c2881f3ba8b686e59df25e Mon Sep 17 00:00:00 2001 From: Alex Goins Date: Thu, 16 Jun 2016 20:06:51 -0700 Subject: [PATCH] modesetting: Always load ms->drmmode.pageflip ms->drmmode.pageflip was only loaded from options if ms->drmmode.glamor was defined, otherwise it would always assume FALSE. PRIME Synchronization requires ms->drmmode.pageflip even if we aren't using glamor, so load it unconditionally. v1: N/A v2: N/A v3: N/A v4: N/A v5: Initial commit v6: Rebase onto ToT v7: Unchanged Reviewed-by: Dave Airlie Signed-off-by: Alex Goins --- hw/xfree86/drivers/modesetting/driver.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 0059e563c..97a74044e 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -873,10 +873,7 @@ PreInit(ScrnInfoPtr pScrn, int flags) try_enable_glamor(pScrn); - if (ms->drmmode.glamor) { - ms->drmmode.pageflip = - xf86ReturnOptValBool(ms->drmmode.Options, OPTION_PAGEFLIP, TRUE); - } else { + if (!ms->drmmode.glamor) { Bool prefer_shadow = TRUE; ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value); @@ -892,10 +889,11 @@ PreInit(ScrnInfoPtr pScrn, int flags) "ShadowFB: preferred %s, enabled %s\n", prefer_shadow ? "YES" : "NO", ms->drmmode.shadow_enable ? "YES" : "NO"); - - ms->drmmode.pageflip = FALSE; } + ms->drmmode.pageflip = + xf86ReturnOptValBool(ms->drmmode.Options, OPTION_PAGEFLIP, TRUE); + pScrn->capabilities = 0; #ifdef DRM_CAP_PRIME ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value);