From 464cbee1c625d60ac9e18b7f4e3d53bc83b0d585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Spintzyk?= Date: Fri, 18 Sep 2020 14:29:25 +0200 Subject: [PATCH] modesetting: Initialize present extension despite glamor is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Łukasz Spintzyk (cherry picked from commit d03c0de77ba36bb5221d00ac84dcdd6aae0df453) --- hw/xfree86/drivers/modesetting/driver.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 8ca3e897a..ec4189a2c 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -1747,10 +1747,6 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) "Failed to initialize the DRI2 extension.\n"); } - if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Failed to initialize the Present extension.\n"); - } /* enable reverse prime if we are a GPU screen, and accelerated, and not * i915, evdi or udl. i915 is happy scanning out from sysmem. * evdi and udl are virtual drivers scanning out from sysmem @@ -1781,6 +1777,11 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) } } #endif + if (!(ms->drmmode.present_enable = ms_present_screen_init(pScreen))) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize the Present extension.\n"); + } + pScrn->vtSema = TRUE;