rpms/xorg-x11-drv-i810/devel intel-batchbuffer.patch, 1.1, 1.2 intel-stub.c, 1.3, 1.4 xorg-x11-drv-i810.spec, 1.90, 1.91
Kristian Høgsberg (krh)
fedora-extras-commits at redhat.com
Tue Apr 1 22:51:07 UTC 2008
Author: krh
Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv815
Modified Files:
intel-batchbuffer.patch intel-stub.c xorg-x11-drv-i810.spec
Log Message:
* 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.
intel-batchbuffer.patch:
Index: intel-batchbuffer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/intel-batchbuffer.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-batchbuffer.patch 27 Feb 2008 23:22:16 -0000 1.1
+++ intel-batchbuffer.patch 1 Apr 2008 22:50:28 -0000 1.2
@@ -1,6 +1,59 @@
-diff -up ./src/i810_driver.c~ ./src/i810_driver.c
---- ./src/i810_driver.c~ 2008-02-21 14:23:05.000000000 -0500
-+++ ./src/i810_driver.c 2008-02-27 15:06:49.000000000 -0500
+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
+@@ -200,6 +200,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #include "i830_video.h"
+ #include "intel_bufmgr_exa.h"
+
++#include "xf86Priv.h"
++
+ #ifdef XF86DRI
+ #include "dri.h"
+ #include <sys/ioctl.h>
+@@ -1182,6 +1184,20 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
+ xf86CrtcSetSizeRange (pScrn, 320, 200, max_width, max_height);
+ }
+
++static int dri2InServerLayout(void)
++{
++ enum { FLAG_DRI2 = 1 };
++ static OptionInfoRec dri2Options[] = {
++ { FLAG_DRI2, "DRI2", OPTV_BOOLEAN, { 0 }, FALSE },
++ { -1, NULL, OPTV_NONE, { 0 }, FALSE },
++ };
++ Bool value;
++
++ xf86ProcessOptions(-1, xf86ConfigLayout.options, 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
+
+ #if defined(DRI2)
+ /* Load the dri2 module if requested. */
+- if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI2, FALSE) &&
++ if ((xf86ReturnOptValBool(pI830->Options, OPTION_DRI2, FALSE) ||
++ dri2InServerLayout()) &&
+ !pI830->directRenderingDisabled) {
+ xf86LoadSubModule(pScrn, "dri2");
+ }
+@@ -2594,7 +2611,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr
+
+ pI830->directRendering = DRI_TYPE_NONE;
+ #ifdef DRI2
+- if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI2, FALSE))
++ if (xf86ReturnOptValBool(pI830->Options, OPTION_DRI2, FALSE) ||
++ dri2InServerLayout())
+ 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
@@ -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- intel-stub.c 1 Apr 2008 19:44:55 -0000 1.3
+++ intel-stub.c 1 Apr 2008 22:50:28 -0000 1.4
@@ -41,10 +41,12 @@
enum {
FLAG_BATCHBUFFER,
+ FLAG_DRI2,
};
static OptionInfoRec stubOptions[] = {
{ FLAG_BATCHBUFFER, "intel-batchbuffer", OPTV_BOOLEAN, { 0 }, FALSE },
+ { FLAG_DRI2, "DRI2", OPTV_BOOLEAN, { 0 }, FALSE },
{ -1, NULL, OPTV_NONE, { 0 }, FALSE },
};
@@ -71,14 +73,15 @@
close(cmdline_fd);
}
- if (kmode == 0) {
- xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions);
- if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value)
- name = "intel_batchbuffer";
- else
- name = "intel_master";
- } else
+ 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";
driver = LoadSubModule(module, name, NULL, NULL, NULL, NULL,
errmaj, errmin);
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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- xorg-x11-drv-i810.spec 1 Apr 2008 19:44:55 -0000 1.90
+++ xorg-x11-drv-i810.spec 1 Apr 2008 22:50:28 -0000 1.91
@@ -1,11 +1,11 @@
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define batchbuffer_version 2.2.0-188-g49af3c4
+%define batchbuffer_version 2.2.0-217-g58956ca
Summary: Xorg X11 Intel video driver(s)
Name: xorg-x11-drv-i810
Version: 2.2.1
-Release: 16%{?dist}
+Release: 17%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -34,7 +34,6 @@
Patch100: intel-master.patch
Patch101: intel-batchbuffer.patch
-Patch102: intel-modeset.patch
Patch103: intel-disable-stepping.patch
Patch104: intel-fix-modeset-vt-switch.patch
@@ -80,9 +79,7 @@
%patch100 -p1 -b .intel-master
cd ../xf86-video-intel-%{batchbuffer_version}
-%patch6 -p1 -b .pciaccessvers
%patch101 -p1 -b .intel-batchbuffer
-%patch102 -p1 -b .intel-modeset
%patch103 -p1 -b .intel-stepping
%patch104 -p1 -b .intel-fix-vt-modeset
@@ -148,6 +145,10 @@
%{_libdir}/libI810XvMC.so
%changelog
+* 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.
+
* Tue Apr 01 2008 Adam Jackson <ajax at redhat.com> 2.2.1-16
- intel-stub.c: Remember the i810 users! (#439845)
More information about the fedora-extras-commits
mailing list