6882497 When you upgrade to X NV build 124, the nvidia driver is not used without xorg.conf
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Wed, 16 Sep 2009 13:06:25 -0700
changeset 784 b5001053afaa
parent 783 2ba69490c44b
child 785 7f9533fe2590
6882497 When you upgrade to X NV build 124, the nvidia driver is not used without xorg.conf
open-src/xserver/xorg/vt.patch
--- a/open-src/xserver/xorg/vt.patch	Mon Sep 14 10:00:00 2009 -0700
+++ b/open-src/xserver/xorg/vt.patch	Wed Sep 16 13:06:25 2009 -0700
@@ -64,6 +64,36 @@
      alwaysCheckForInput[0] = 0;
      alwaysCheckForInput[1] = 1;
      while(1)
+diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
+--- hw/xfree86/common/xf86AutoConfig.c~	2009-08-15 19:21:29.790065000 -0700
++++ hw/xfree86/common/xf86AutoConfig.c	2009-08-18 15:07:14.284126000 -0700
+@@ -475,8 +475,25 @@ listPossibleVideoDrivers(char *matches[]
+     if (xf86Info.consoleFd >= 0) {
+ 	struct vis_identifier   visid;
+ 	const char *cp;
++	extern char xf86SolarisFbDev[PATH_MAX];
++	int iret;
+ 
+-	if (ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid) >= 0) {
++	SYSCALL(iret = ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid));
++	if (iret < 0) {
++	    int fbfd;
++
++	    fbfd = open(xf86SolarisFbDev, O_RDONLY);
++	    if (fbfd >= 0) {
++		SYSCALL(iret = ioctl(fbfd, VIS_GETIDENTIFIER, &visid));
++		close(fbfd);
++	    }
++	}
++
++	if (iret < 0) {
++	    xf86Msg(X_WARNING,
++		    "could not get frame buffer identifier from %s\n",
++		    xf86SolarisFbDev);
++	} else {
+ 	    xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
+ 
+ 	    /* Special case from before the general case was set */
 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Events.c hw/xfree86/common/xf86Events.c
 --- hw/xfree86/common/xf86Events.c	2009-07-08 01:48:58.000000000 +0800
 +++ hw/xfree86/common/xf86Events.c	2009-09-08 16:29:20.326923000 +0800