summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2017-06-05 16:17:47 -0400
committerAdam Jackson <ajax@redhat.com>2017-06-16 15:47:57 -0400
commit8e7642e7906a765376aac35f709ca50e832b4ed8 (patch)
tree3ce6273be6287fd3000148657bef2d7095e19d96
parentc999a0f9e5c55281d21beb8345602f83fa2fe0fc (diff)
dri1: DRI1 clients are VT clients
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xfree86/dri/dri.c3
-rw-r--r--hw/xfree86/dri/xf86dri.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 9f7075996..637d30eb4 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -825,6 +825,9 @@ DRIExtensionInit(void)
if (!DRIDrawablePrivResType || !DRIContextPrivResType)
return FALSE;
+ if (!xf86SetupVTClients())
+ return FALSE;
+
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
return TRUE;
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 8f3c2d602..731c228d8 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -178,6 +178,7 @@ ProcXF86DRIOpenConnection(register ClientPtr client)
#endif
};
+ xf86SetVTClient(client);
WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), &rep);
if (busIdStringLength)
WriteToClient(client, busIdStringLength, busIdString);
@@ -521,6 +522,9 @@ ProcXF86DRIDispatch(register ClientPtr client)
{
REQUEST(xReq);
+ if (!xf86VTOwner())
+ return xf86SetAndSleepVTClient(client);
+
switch (stuff->data) {
case X_XF86DRIQueryVersion:
return ProcXF86DRIQueryVersion(client);