rpms/xorg-x11-drv-i810/devel intel-batchbuffer.patch, 1.2, 1.3 intel-stub.c, 1.4, 1.5 xorg-x11-drv-i810.spec, 1.91, 1.92

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13440

Modified Files:
	intel-batchbuffer.patch intel-stub.c xorg-x11-drv-i810.spec 
Log Message:
* Wed Apr  2 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-18
- Tweak intel-stub.c and batchbuffer branch to read options from
  server flags section too.


intel-batchbuffer.patch:

Index: intel-batchbuffer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-batchbuffer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- intel-batchbuffer.patch	1 Apr 2008 22:50:28 -0000	1.2
+++ intel-batchbuffer.patch	2 Apr 2008 23:27:57 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up ./src/i830_driver.c.intel-batchbuffer ./src/i830_driver.c
---- ./src/i830_driver.c.intel-batchbuffer	2008-04-01 18:21:24.000000000 -0400
-+++ ./src/i830_driver.c	2008-04-01 18:34:10.000000000 -0400
+--- ./src/i830_driver.c.intel-batchbuffer	2008-03-31 18:09:37.000000000 -0400
++++ ./src/i830_driver.c	2008-04-02 15:59:58.000000000 -0400
 @@ -200,6 +200,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  #include "i830_video.h"
  #include "intel_bufmgr_exa.h"
@@ -10,10 +10,12 @@
  #ifdef XF86DRI
  #include "dri.h"
  #include <sys/ioctl.h>
-@@ -1182,6 +1184,20 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
+@@ -1182,6 +1184,26 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
      xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
  }
  
++extern XF86ConfigPtr xf86configptr;
++
 +static int dri2InServerLayout(void)
 +{
 +    enum { FLAG_DRI2 = 1 };
@@ -25,13 +27,17 @@
 +
 +    xf86ProcessOptions(-1, xf86ConfigLayout.options, dri2Options);
 +
++    if (xf86configptr->conf_flags && xf86configptr->conf_flags->flg_option_lst)
++	xf86ProcessOptions(-1, xf86configptr->conf_flags->flg_option_lst,
++			   dri2Options);
++    
 +    return xf86GetOptValBool(dri2Options, FLAG_DRI2, &value) && value;
 +}
 +
  /**
   * This is called per zaphod head (so usually just once) to do initialization
   * before the Screen is created.
-@@ -1838,7 +1854,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
+@@ -1838,7 +1860,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
  
  #if defined(DRI2)
     /* Load the dri2 module if requested. */
@@ -41,7 +47,7 @@
         !pI830->directRenderingDisabled) {
         xf86LoadSubModule(pScrn, "dri2");
     }
-@@ -2594,7 +2611,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
+@@ -2594,7 +2617,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
  
     pI830->directRendering = DRI_TYPE_NONE;
  #ifdef DRI2
@@ -51,9 +57,8 @@
         I830DRI2Prepare(pScreen);
  #endif
  
-diff -up ./src/i810_driver.c.intel-batchbuffer ./src/i810_driver.c
 --- ./src/i810_driver.c.intel-batchbuffer	2008-03-31 17:57:25.000000000 -0400
-+++ ./src/i810_driver.c	2008-04-01 18:02:31.000000000 -0400
++++ ./src/i810_driver.c	2008-04-02 15:40:36.000000000 -0400
 @@ -460,7 +460,7 @@ static XF86ModuleVersionInfo intelVersRe
     {0, 0, 0, 0}
  };


Index: intel-stub.c
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-stub.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- intel-stub.c	1 Apr 2008 22:50:28 -0000	1.4
+++ intel-stub.c	2 Apr 2008 23:27:57 -0000	1.5
@@ -31,9 +31,11 @@
  */
 
 #include <fcntl.h>
+#include <unistd.h>
 #include "xorg-server.h"
 #include "xf86.h"
 #include "xf86Priv.h"
+#include "xf86Parser.h"
 
 #define INTEL_VERSION_MAJOR 2
 #define INTEL_VERSION_MINOR 2
@@ -50,43 +52,56 @@
 	{ -1, NULL, OPTV_NONE, { 0 }, FALSE },
 };
 
-static pointer
-intelStubSetup(pointer module, pointer options, int *errmaj, int *errmin)
+extern XF86ConfigPtr xf86configptr;
+
+static const char *
+getDriverName(void)
 {
-	pointer driver;
 	Bool value;
-	const char *name;
 	int cmdline_fd;
 	int kmode = 0;
 	
 	cmdline_fd = open("/proc/cmdline", O_RDONLY);
 	if (cmdline_fd >= 0) {
-	    char buf[255];
-	    int ret;
+		char buf[255];
+		int ret;
 
-	    ret = read(cmdline_fd, buf, 255);
-	    if (ret > 0) {
-		if (strstr(buf, "i915.modeset=1")) {
-		    kmode = 1;
+		ret = read(cmdline_fd, buf, 255);
+		if (ret > 0) {
+			if (strstr(buf, "i915.modeset=1")) {
+				kmode = 1;
+			}
 		}
-	    }
-	    close(cmdline_fd);
+		close(cmdline_fd);
 	}
 
-	xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions);
 	if (kmode)
-	    name = "intel_batchbuffer";
-	else if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value)
-	    name = "intel_batchbuffer";
-	else if (xf86GetOptValBool(stubOptions, FLAG_DRI2, &value) && value)
-	    name = "intel_batchbuffer";
-	else
-	    name = "intel_master";
+		return "intel_batchbuffer";
+
+	xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions);
+	if (xf86configptr->conf_flags &&
+	    xf86configptr->conf_flags->flg_option_lst)
+		xf86ProcessOptions(-1,
+				   xf86configptr->conf_flags->flg_option_lst,
+				   stubOptions);
+
+	if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value)
+		return "intel_batchbuffer";
+	if (xf86GetOptValBool(stubOptions, FLAG_DRI2, &value) && value)
+		return "intel_batchbuffer";
 
-	driver = LoadSubModule(module, name, NULL, NULL, NULL, NULL, 
-			       errmaj, errmin);
+	return "intel_master";
+}
 
-	return driver;
+static pointer
+intelStubSetup(pointer module, pointer options, int *errmaj, int *errmin)
+{
+	const char *name;
+
+	name = getDriverName();
+
+	return LoadSubModule(module, name, NULL, NULL, NULL, NULL,
+			     errmaj, errmin);
 }
 
 static XF86ModuleVersionInfo intelStubVersRec = {


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-drv-i810.spec	1 Apr 2008 22:50:28 -0000	1.91
+++ xorg-x11-drv-i810.spec	2 Apr 2008 23:27:57 -0000	1.92
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -145,6 +145,10 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Apr  2 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-18
+- Tweak intel-stub.c and batchbuffer branch to read options from
+  server flags section too.
+
 * Tue Apr  1 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-17
 - Add new snapshot of the batchbuffer driver to go with the DRI2 changes.
 - Add "DRI2" as a server layout options to enable batchbuffer and DRI2.