frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
This commit is contained in:
Alex Goins 2016-06-16 20:06:51 -07:00 committed by Adam Jackson
parent b773a9c812
commit 378c85a884
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/drivers/modesetting/driver.c
View File

@ -873,10 +873,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
try_enable_glamor(pScrn); try_enable_glamor(pScrn);
if (ms->drmmode.glamor) { if (!ms->drmmode.glamor) {
ms->drmmode.pageflip =
xf86ReturnOptValBool(ms->drmmode.Options, OPTION_PAGEFLIP, TRUE);
} else {
Bool prefer_shadow = TRUE; Bool prefer_shadow = TRUE;
ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value); 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", "ShadowFB: preferred %s, enabled %s\n",
prefer_shadow ? "YES" : "NO", prefer_shadow ? "YES" : "NO",
ms->drmmode.shadow_enable ? "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; pScrn->capabilities = 0;
#ifdef DRM_CAP_PRIME #ifdef DRM_CAP_PRIME
ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value); ret = drmGetCap(ms->fd, DRM_CAP_PRIME, &value);