path: root/hw/xfree86
diff options
authorEmil Velikov <>2019-07-17 16:07:43 +0100
committerEmil Velikov <>2019-10-11 12:03:42 +0000
commit4018811838c344ee92d10e60789853e4ba512612 (patch)
tree0488d2cf5cf362a628f7d733d10c33bed093f52e /hw/xfree86
parent1b5183b26d9977d46f6624126a2b2b6d77a74659 (diff)
glamor_egl: don't use ScrnInfoRec::privates
Move from the xf86 specific ScrnInfoRec::privates, to the dix private handling. Since there's no FreeScreen function in ScreenPtr, fold the former within the existing CloseScreen. Users, such as modesetting are updated, and out of tree drivers will need equivalent, yet trivial, patch. Note: we need to ensure that the screen private is unset and the screen callbacks are restored in our CloseScreen function. Signed-off-by: Emil Velikov <>
Diffstat (limited to 'hw/xfree86')
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index da7279c13..82e7f81d6 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(pScrn, ms->fd)) {
+ if (glamor_egl_init(xf86ScrnToScreen(pScrn), ms->fd)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "glamor initialized\n");
ms->drmmode.glamor = TRUE;
} else {