jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-02 07:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg-server: downgrade to xorg-server-1.8.1.902 because of failures with binary nVidia driver

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-06-27 20:00:15 +02:00
parent c634c213ab
commit a94844777a
4 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/x11/driver/xf86-video-intel/patches/uevent.diff
View File

@ -1,7 +1,7 @@
diff -up xf86-video-intel-2.10.0/src/i830_driver.c.dave xf86-video-intel-2.10.0/src/i830_driver.c diff -up xf86-video-intel-2.12.0/src/i830_driver.c.uevent xf86-video-intel-2.12.0/src/i830_driver.c
--- xf86-video-intel-2.10.0/src/i830_driver.c.dave 2010-01-13 18:48:49.000000000 +1000 --- xf86-video-intel-2.12.0/src/i830_driver.c.uevent 2010-06-24 16:29:49.000000000 -0400
+++ xf86-video-intel-2.10.0/src/i830_driver.c 2010-01-13 18:51:09.000000000 +1000 +++ xf86-video-intel-2.12.0/src/i830_driver.c 2010-06-25 11:40:01.335975581 -0400
@@ -83,6 +83,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -81,6 +81,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "i915_drm.h" #include "i915_drm.h"
#include <xf86drmMode.h> #include <xf86drmMode.h>
@ -10,7 +10,7 @@ diff -up xf86-video-intel-2.10.0/src/i830_driver.c.dave xf86-video-intel-2.10.0/
#define BIT(x) (1 << (x)) #define BIT(x) (1 << (x))
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#define NB_OF(x) (sizeof (x) / sizeof (*x)) #define NB_OF(x) (sizeof (x) / sizeof (*x))
@@ -1167,6 +1169,80 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc) @@ -996,6 +998,80 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc); return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
} }
@ -91,16 +91,16 @@ diff -up xf86-video-intel-2.10.0/src/i830_driver.c.dave xf86-video-intel-2.10.0/
static Bool static Bool
I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
{ {
@@ -1425,6 +1501,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr @@ -1233,6 +1309,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr
intel->suspended = FALSE; intel->suspended = FALSE;
+ I830UeventInit(scrn); + I830UeventInit(scrn);
+ +
return TRUE; return uxa_resources_init(screen);
} }
@@ -1529,7 +1607,8 @@ static Bool I830CloseScreen(int scrnInde @@ -1306,7 +1384,8 @@ static Bool I830CloseScreen(int scrnInde
{ {
ScrnInfoPtr scrn = xf86Screens[scrnIndex]; ScrnInfoPtr scrn = xf86Screens[scrnIndex];
intel_screen_private *intel = intel_get_screen_private(scrn); intel_screen_private *intel = intel_get_screen_private(scrn);
@ -110,9 +110,9 @@ diff -up xf86-video-intel-2.10.0/src/i830_driver.c.dave xf86-video-intel-2.10.0/
if (scrn->vtSema == TRUE) { if (scrn->vtSema == TRUE) {
I830LeaveVT(scrnIndex, 0); I830LeaveVT(scrnIndex, 0);
} }
diff -up xf86-video-intel-2.10.0/src/i830.h.dave xf86-video-intel-2.10.0/src/i830.h diff -up xf86-video-intel-2.12.0/src/i830.h.uevent xf86-video-intel-2.12.0/src/i830.h
--- xf86-video-intel-2.10.0/src/i830.h.dave 2010-01-13 18:48:50.000000000 +1000 --- xf86-video-intel-2.12.0/src/i830.h.uevent 2010-06-24 16:29:49.000000000 -0400
+++ xf86-video-intel-2.10.0/src/i830.h 2010-01-13 18:50:01.000000000 +1000 +++ xf86-video-intel-2.12.0/src/i830.h 2010-06-25 11:39:15.665029821 -0400
@@ -47,6 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN @@ -47,6 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#ifndef _I830_H_ #ifndef _I830_H_
#define _I830_H_ #define _I830_H_
@ -122,7 +122,7 @@ diff -up xf86-video-intel-2.10.0/src/i830.h.dave xf86-video-intel-2.10.0/src/i83
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#include "compiler.h" #include "compiler.h"
#include "xf86PciInfo.h" #include "xf86PciInfo.h"
@@ -385,6 +387,9 @@ typedef struct intel_screen_private { @@ -432,6 +434,9 @@ typedef struct intel_screen_private {
*/ */
Bool fallback_debug; Bool fallback_debug;
unsigned debug_flush; unsigned debug_flush;
@ -132,15 +132,15 @@ diff -up xf86-video-intel-2.10.0/src/i830.h.dave xf86-video-intel-2.10.0/src/i83
} intel_screen_private; } intel_screen_private;
enum { enum {
diff -up xf86-video-intel-2.10.0/src/Makefile.am.dave xf86-video-intel-2.10.0/src/Makefile.am diff -up xf86-video-intel-2.12.0/src/Makefile.am.uevent xf86-video-intel-2.12.0/src/Makefile.am
--- xf86-video-intel-2.10.0/src/Makefile.am.dave 2010-01-05 08:09:52.000000000 +1000 --- xf86-video-intel-2.12.0/src/Makefile.am.uevent 2010-06-24 16:29:37.000000000 -0400
+++ xf86-video-intel-2.10.0/src/Makefile.am 2010-01-13 18:49:14.000000000 +1000 +++ xf86-video-intel-2.12.0/src/Makefile.am 2010-06-25 11:39:15.665029821 -0400
@@ -32,7 +32,7 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @ @@ -32,7 +32,7 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @
intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LTLIBRARIES = intel_drv.la
intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_la_LDFLAGS = -module -avoid-version
intel_drv_ladir = @moduledir@/drivers intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la -intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
+intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la -ludev +intel_drv_la_LIBADD = -ludev -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
intel_drv_la_LIBADD += @PCIACCESS_LIBS@ intel_drv_la_LIBADD += @PCIACCESS_LIBS@
INTEL_DRI_SRCS = \ INTEL_DRI_SRCS = \

10
packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff
View File

@ -1,12 +1,12 @@
diff -Naur xorg-server-1.8.99.903/hw/xfree86/common/xf86pciBus.c xorg-server-1.8.99.903.patch/hw/xfree86/common/xf86pciBus.c diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86AutoConfig.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86AutoConfig.c
--- xorg-server-1.8.99.903/hw/xfree86/common/xf86pciBus.c 2010-06-10 16:07:55.000000000 +0200 --- xorg-server-1.7.99.1/hw/xfree86/common/xf86AutoConfig.c 2009-10-13 19:04:27.000000000 +0200
+++ xorg-server-1.8.99.903.patch/hw/xfree86/common/xf86pciBus.c 2010-06-27 01:06:57.977808296 +0200 +++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86AutoConfig.c 2009-12-04 21:39:57.414303608 +0100
@@ -1129,7 +1129,7 @@ @@ -192,7 +192,7 @@
break; break;
case 0x102b: driverList[0] = "mga"; break; case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break; case 0x10c8: driverList[0] = "neomagic"; break;
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; - case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
+ case 0x10de: case 0x12d2: driverList[0] = "nvidia"; break; + case 0x10de: case 0x12d2: driverList[0] = "nvidia"; break;
case 0x1106: driverList[0] = "openchrome"; break; case 0x1106: driverList[0] = "openchrome"; break;
case 0x1b36: driverList[0] = "qxl"; break;
case 0x1163: driverList[0] = "rendition"; break; case 0x1163: driverList[0] = "rendition"; break;
case 0x5333:

33
packages/x11/xserver/xorg-server/patches/use-sloppy-heuristic-first-for-initial-mode.diff
View File

@ -1,16 +1,17 @@
diff -Naur xorg-server-1.8.99.903/hw/xfree86/modes/xf86Crtc.c xorg-server-1.8.99.903.patch/hw/xfree86/modes/xf86Crtc.c diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
--- xorg-server-1.8.99.903/hw/xfree86/modes/xf86Crtc.c 2010-06-15 23:39:25.000000000 +0200 index 84d3cac..673612f 100644
+++ xorg-server-1.8.99.903.patch/hw/xfree86/modes/xf86Crtc.c 2010-06-27 00:53:28.722808399 +0200 --- a/hw/xfree86/modes/xf86Crtc.c
@@ -2379,10 +2379,10 @@ +++ b/hw/xfree86/modes/xf86Crtc.c
xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); @@ -2248,10 +2248,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); - else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
+ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
+ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); + else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
else + xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); else
} xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");

2
packages/x11/xserver/xorg-server/url
View File

@ -1 +1 @@
http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.99.903.tar.bz2 http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.8.1.902.tar.bz2