summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-10-14 12:48:24 +0200
committerMichel Dänzer <michel@daenzer.net>2019-10-14 12:48:24 +0200
commit535f14656a2a42f0cca13a4264e8111300e5806d (patch)
treeed6168850926c750987419296d00105281c01076 /hw/xfree86
parent5315f988d9f175e4850f4259f691a68d95ce7ac2 (diff)
Revert https://gitlab.freedesktop.org/xorg/xserver/merge_requests/235
Caused assertion failures / crashes with Xorg. Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/916
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/drivers/modesetting/driver.c2
-rw-r--r--hw/xfree86/drivers/modesetting/drmmode_display.c8
2 files changed, 2 insertions, 8 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 82e7f81d6..da7279c13 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -768,7 +768,7 @@ try_enable_glamor(ScrnInfoPtr pScrn)
}
if (xf86LoadSubModule(pScrn, GLAMOR_EGL_MODULE_NAME)) {
- if (glamor_egl_init(xf86ScrnToScreen(pScrn), ms->fd)) {
+ if (glamor_egl_init(pScrn, ms->fd)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n");
ms->drmmode.glamor = TRUE;
} else {
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 27a520743..f621df52f 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -36,7 +36,6 @@
#include "dumb_bo.h"
#include "inputstr.h"
#include "xf86str.h"
-#include "xf86Priv.h"
#include "X11/Xatom.h"
#include "micmap.h"
#include "xf86cmap.h"
@@ -3413,12 +3412,7 @@ drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
if (drmmode->glamor) {
- unsigned int flags = GLAMOR_USE_EGL_SCREEN;
-
- if (xf86Info.debug != NULL && !strstr(xf86Info.debug, "dmabuf_capable"))
- flags |= GLAMOR_NO_MODIFIERS;
-
- if (!glamor_init(pScreen, flags)) {
+ if (!glamor_init(pScreen, GLAMOR_USE_EGL_SCREEN)) {
return FALSE;
}
#ifdef GBM_BO_WITH_MODIFIERS