rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

- removed N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch

Browse Source 
* meanwhile cirrus and mgag200 Kernel drivers have been rewritten
    multiple times and no longer have (broken) hardware cursor

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=836
This commit is contained in:
Stefan Dirsch 2022-11-02 15:48:38 +00:00 committed by Git OBS Bridge
parent afbdf4261a
commit d87f454ac7
3 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch
View File

@ -1,35 +0,0 @@
From: Egbert Eich <eich@suse.de>
Date: Mon May 16 21:22:31 2016 +0200
Subject: [PATCH]Disable HW Cursor for cirrus and mgag200 kernel modules.
Patch-mainline: N/A
Git-commit: 265e92915c8182369a50c89f9ca0d36b9baab8b6
References: boo#980124
Signed-off-by: Egbert Eich <eich@suse.com>
Signed-off-by: Egbert Eich <eich@suse.de>
---
hw/xfree86/drivers/modesetting/driver.c | 11 +++++++++++
1 file changed, 11 insertions(+)
Index: xorg-server-1.20.5/hw/xfree86/drivers/modesetting/driver.c
===================================================================
--- xorg-server-1.20.5.orig/hw/xfree86/drivers/modesetting/driver.c
+++ xorg-server-1.20.5/hw/xfree86/drivers/modesetting/driver.c
@@ -980,6 +980,17 @@ PreInit(ScrnInfoPtr pScrn, int flags)
if (xf86ReturnOptValBool(ms->drmmode.Options, OPTION_SW_CURSOR, FALSE)) {
ms->drmmode.sw_cursor = TRUE;
+ } else {
+ /* hw cursor still considered broken on cirrus */
+ drmVersionPtr drm_version = drmGetVersion(ms->fd);
+ if (drm_version) {
+ if (strncmp("cirrus", drm_version->name,
+ min(7,drm_version->name_len)) == 0 ||
+ strncmp("mgag200", drm_version->name,
+ min(8,drm_version->name_len)) == 0)
+ ms->drmmode.sw_cursor = TRUE;
+ drmFreeVersion(drm_version);
+ }
}
ms->cursor_width = 64;

7
xorg-x11-server.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 2 15:37:07 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- removed N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch
* meanwhile cirrus and mgag200 Kernel drivers have been rewritten
multiple times and no longer have (broken) hardware cursor
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 2 12:29:59 UTC 2022 - Thomas Zimmermann <tzimmermann@suse.de> Wed Nov 2 12:29:59 UTC 2022 - Thomas Zimmermann <tzimmermann@suse.de>

3
xorg-x11-server.spec
View File

@ -213,8 +213,6 @@ Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grab
Patch104: u_xorg-server-xdmcp.patch Patch104: u_xorg-server-xdmcp.patch
Patch115: N_Disable-HW-Cursor-for-cirrus-and-mgag200-kernel-modules.patch
Patch117: xorg-x11-server-byte-order.patch Patch117: xorg-x11-server-byte-order.patch
Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch Patch160: u_vesa-Add-VBEDPMSGetCapabilities-VBEDPMSGet.patch
@ -378,7 +376,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
%patch100 -p1 %patch100 -p1
#%patch101 -p1 #%patch101 -p1
%patch104 -p1 %patch104 -p1
%patch115 -p1
%patch117 -p1 %patch117 -p1
%patch160 -p1 %patch160 -p1
%patch208 -p1 %patch208 -p1