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

Accepting request 20273 from X11:XOrg

Browse Source 
Copy from X11:XOrg/xorg-x11-server based on submit request 20273 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/20273
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=139
This commit is contained in:
OBS User autobuild 2009-09-10 10:54:30 +00:00 committed by Git OBS Bridge
parent de140e0677
commit 50bab4cf0c
5 changed files with 136 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch Normal file
View File

@ -0,0 +1,68 @@
From 1efa035209aea97d452d829e29af2e5f1ac94272 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Fri, 4 Sep 2009 17:32:45 +0200
Subject: [PATCH] Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
Apparently SavedCursor is sometime tried to be set while already being set.
---
hw/xfree86/modes/xf86Cursors.c | 8 ++++++++
hw/xfree86/ramdac/xf86Cursor.c | 17 ++++++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 8c5a94c..3436636 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -461,6 +461,10 @@ xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+ if (xf86_config->cursor == cursor) {
+ xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n");
+ return FALSE;
+ }
if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor;
@@ -480,6 +484,10 @@ xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
+ if (xf86_config->cursor == cursor) {
+ xf86DrvMsg(index, X_ERROR, "Trying to set already set cursor.\n");
+ return FALSE;
+ }
if (xf86_config->cursor)
FreeCursor (xf86_config->cursor, None);
xf86_config->cursor = cursor;
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 6b71f46..7aa7039 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -209,13 +209,16 @@ xf86CursorEnableDisableFBAccess(
xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
&pScreen->devPrivates, xf86CursorScreenKey);
- if (!enable && ScreenPriv->CurrentCursor != NullCursor) {
- CursorPtr currentCursor = ScreenPriv->CurrentCursor;
- xf86CursorSetCursor(pDev, pScreen, NullCursor, ScreenPriv->x,
- ScreenPriv->y);
- ScreenPriv->isUp = FALSE;
- ScreenPriv->SWCursor = TRUE;
- ScreenPriv->SavedCursor = currentCursor;
+ if (!enable) {
+ if (ScreenPriv->CurrentCursor != NullCursor) {
+ CursorPtr currentCursor = ScreenPriv->CurrentCursor;
+ xf86CursorSetCursor(pDev, pScreen, NullCursor, ScreenPriv->x,
+ ScreenPriv->y);
+ ScreenPriv->isUp = FALSE;
+ ScreenPriv->SWCursor = TRUE;
+ ScreenPriv->SavedCursor = currentCursor;
+ } else
+ ScreenPriv->SavedCursor = NULL;
}
if (ScreenPriv->EnableDisableFBAccess)
--
1.6.0.2

25
bug534768-prefer_local_symbols.patch Normal file
View File

@ -0,0 +1,25 @@
Index: xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c
===================================================================
--- xorg-server-1.6.3.901.orig/hw/xfree86/loader/dlloader.c
+++ xorg-server-1.6.3.901/hw/xfree86/loader/dlloader.c
@@ -120,7 +120,7 @@ DLFindSymbol(const char *name)
}
if (!global_scope)
- global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
+ global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND);
if (global_scope)
return DLFindSymbolLocal(global_scope, name);
@@ -136,9 +136,9 @@ DLLoadModule(loaderPtr modrec, int flags
int dlopen_flags;
if (flags & LD_FLAG_GLOBAL)
- dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
+ dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL | RTLD_DEEPBIND;
else
- dlopen_flags = DLOPEN_LAZY;
+ dlopen_flags = DLOPEN_LAZY | RTLD_DEEPBIND;
dlfile = dlopen(modrec->name, dlopen_flags);
if (dlfile == NULL) {
ErrorF("dlopen: %s\n", dlerror());

19
moblin-use_preferred_mode_for_all_outputs.diff Normal file
View File

@ -0,0 +1,19 @@
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 69f687b..5aae114 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2365,13 +2365,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
xf86CollectEnabledOutputs(scrn, config, enabled);
- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
- else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
+ if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
else
xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");

17
xorg-x11-server.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Sep 9 23:29:33 CEST 2009 - sndirsch@suse.de
- moblin-use_preferred_mode_for_all_outputs.diff
* use each outputs preferred mode (bnc #537488)
-------------------------------------------------------------------
Tue Sep 8 17:28:32 CEST 2009 - mhopf@novell.com
- Prefer locally defined symbols in modules (bnc #534768).
-------------------------------------------------------------------
Fri Sep 4 18:11:09 CEST 2009 - mhopf@novell.com
- 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch:
Fixes segfaults with intel and KMS upon resume (only occuring sporadically).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 27 18:26:05 CEST 2009 - eich@suse.de Thu Aug 27 18:26:05 CEST 2009 - eich@suse.de

8
xorg-x11-server.spec
View File

@ -33,7 +33,7 @@ BuildRequires: libjpeg-devel
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0 %define EXPERIMENTAL 0
Version: 7.4 Version: 7.4
Release: 51 Release: 52
License: GPL v2 or later ; MIT License (or similar) License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4 Group: System/X11/Servers/XF86_4
@ -133,8 +133,11 @@ Patch168: moblin-xserver-no-root-2.patch
Patch169: moblin-xorg-x11-nonroot-vesa.patch Patch169: moblin-xorg-x11-nonroot-vesa.patch
%if %moblin %if %moblin
Patch170: xserver-boottime.patch Patch170: xserver-boottime.patch
Patch171: moblin-use_preferred_mode_for_all_outputs.diff
%endif %endif
Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
Patch191: 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
Patch200: bug534768-prefer_local_symbols.patch
%description %description
This package contains the X.Org Server. This package contains the X.Org Server.
@ -271,9 +274,12 @@ popd
%patch169 -p1 %patch169 -p1
%if %moblin %if %moblin
%patch170 -p1 %patch170 -p1
%patch171 -p1
%endif %endif
# #
%patch190 -p1 %patch190 -p1
%patch191 -p1
%patch200 -p1
%build %build
pushd xorg-docs-* pushd xorg-docs-*