diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-06-12 02:29:56 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-06-12 03:04:19 -0300 |
| commit | e7fdd9862a088544853362e1ba77d10bd0b718bc (patch) | |
| tree | 2d94e139c68e6d8ca8d054fe4aaa795663c4a4e4 /libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch | |
| parent | 6cf471907c0f09b062d1f5452de9b904a303427e (diff) | |
xorg-server-1.17.1-7.parabola1: add some more patches from Fedora, fixes timeout issues with logind and missing SW cursor with modesetting driver
Diffstat (limited to 'libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch')
| -rw-r--r-- | libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch b/libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch new file mode 100644 index 000000000..ffb08756c --- /dev/null +++ b/libre/xorg-server/0001-modesetting-Fix-software-cursor-fallback.patch @@ -0,0 +1,42 @@ +From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001 +From: Adel Gadllah <adel.gadllah@gmail.com> +Date: Fri, 1 May 2015 17:21:12 +0200 +Subject: [PATCH] modesetting: Fix software cursor fallback +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The code in drmmode_set_cursor does not properly handle the case where +drmModeSetCursor2 returns any other error than EINVAL and silently fails to set +a cursor. + +So only return when the drmModeSetCursor2 succeeds (i.e returns 0) and disable +the cursor2 usage on EINVAL. + +References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725 +Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com> +Reviewed-by: Michel Dänzer <michel@daenzer.net> +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index 824500b..912abda 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc) + drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, + handle, ms->cursor_width, ms->cursor_height, + cursor->bits->xhot, cursor->bits->yhot); ++ if (!ret) ++ return; + if (ret == -EINVAL) + use_set_cursor2 = FALSE; +- else +- return; + } + + ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, +-- +2.1.0 + |