|
 |
5766b0 |
From 846596b38165e5170d1a410f37ce7c5280db649d Mon Sep 17 00:00:00 2001
|
|
|
5766b0 |
From: Adam Jackson <ajax@redhat.com>
|
|
|
5766b0 |
Date: Tue, 9 May 2017 17:02:17 -0400
|
|
|
5766b0 |
Subject: [PATCH] modesetting: software cursor hack
|
|
|
5766b0 |
|
|
|
5766b0 |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
5766b0 |
---
|
|
|
5766b0 |
hw/xfree86/drivers/modesetting/driver.c | 30 +++++++++++++++++++++++++++---
|
|
|
5766b0 |
1 file changed, 27 insertions(+), 3 deletions(-)
|
|
|
5766b0 |
|
|
|
5766b0 |
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
|
|
|
5766b0 |
index 3da69a3..31a58fd 100644
|
|
|
5766b0 |
--- a/hw/xfree86/drivers/modesetting/driver.c
|
|
|
5766b0 |
+++ b/hw/xfree86/drivers/modesetting/driver.c
|
|
|
5766b0 |
@@ -878,6 +878,30 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn)
|
|
|
5766b0 |
}
|
|
|
5766b0 |
|
|
|
5766b0 |
static Bool
|
|
|
5766b0 |
+msDefaultSoftwareCursor(modesettingPtr ms)
|
|
|
5766b0 |
+{
|
|
|
5766b0 |
+ Bool ret = FALSE;
|
|
|
5766b0 |
+ drmVersionPtr v = drmGetVersion(ms->fd);
|
|
|
5766b0 |
+
|
|
|
5766b0 |
+ /*
|
|
|
5766b0 |
+ * This is horrific, don't hate me. The _runtime_ fallback to software
|
|
|
5766b0 |
+ * cursor doesn't seem to take on the first try; you get no cursor in
|
|
|
5766b0 |
+ * gdm, but it works once you log in. However just bombing out at
|
|
|
5766b0 |
+ * init time seems to work fine. So for drivers without hardware cursors
|
|
|
5766b0 |
+ * (or for G200SE, where they're basically unusable) just default to sw.
|
|
|
5766b0 |
+ */
|
|
|
5766b0 |
+ if (!strcmp(v->name, "udl") ||
|
|
|
5766b0 |
+ !strcmp(v->name, "mgag200") ||
|
|
|
5766b0 |
+ !strcmp(v->name, "cirrus") ||
|
|
|
5766b0 |
+ !strcmp(v->name, "ast"))
|
|
|
5766b0 |
+ ret = TRUE;
|
|
|
5766b0 |
+
|
|
|
5766b0 |
+ drmFreeVersion(v);
|
|
|
5766b0 |
+
|
|
|
5766b0 |
+ return ret;
|
|
|
5766b0 |
+}
|
|
|
5766b0 |
+
|
|
|
5766b0 |
+static Bool
|
|
|
5766b0 |
PreInit(ScrnInfoPtr pScrn, int flags)
|
|
|
5766b0 |
{
|
|
|
5766b0 |
modesettingPtr ms;
|
|
|
5766b0 |
@@ -966,9 +990,9 @@ PreInit(ScrnInfoPtr pScrn, int flags)
|
|
|
5766b0 |
if (!xf86SetDefaultVisual(pScrn, -1))
|
|
|
5766b0 |
return FALSE;
|
|
|
5766b0 |
|
|
|
5766b0 |
- if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_SW_CURSOR, FALSE)) {
|
|
|
5766b0 |
- ms->drmmode.sw_cursor = TRUE;
|
|
|
5766b0 |
- }
|
|
|
5766b0 |
+ if (!xf86GetOptValBool(ms->drmmode.Options, OPTION_SW_CURSOR,
|
|
|
5766b0 |
+ &ms->drmmode.sw_cursor))
|
|
|
5766b0 |
+ ms->drmmode.sw_cursor = msDefaultSoftwareCursor(ms);
|
|
|
5766b0 |
|
|
|
5766b0 |
ms->cursor_width = 64;
|
|
|
5766b0 |
ms->cursor_height = 64;
|
|
|
5766b0 |
--
|
|
|
5766b0 |
2.12.0
|
|
|
5766b0 |
|