rpms/xorg-x11-drv-i810/devel intel-2.1.1-efi.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.75, 1.76

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.1.1-efi.patch 
Log Message:
* Thu Feb 28 2008 Adam Jackson <ajax at redhat.com> 2.2.1-2
- intel-2.1.1-efi.patch: Fix SDVO I2C on Mac Mini in EFI mode.


intel-2.1.1-efi.patch:

--- NEW FILE intel-2.1.1-efi.patch ---
diff --git a/src/i810_reg.h b/src/i810_reg.h
index 9eeddc9..466e63d 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -103,6 +103,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define HOTKEY_SWITCH			0x20
 #define HOTKEY_TOGGLE			0x10
 
+/* GMBus registers */
+#define GMBUS0                  0x5100
+#define GMBUS1                  0x5104
+#define GMBUS2                  0x5108
+#define GMBUS3                  0x510c
+#define GMBUS4                  0x5110
+#define GMBUS5                  0x5120
+                                
 /* Blitter control, p378
  */
 #define BITBLT_CNTL        0x7000c
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 7d0c0a0..8c8e473 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -627,6 +627,20 @@ static struct i830SnapshotRec {
     DEFINEREG(MI_ARB_STATE),
     DEFINEREG(MI_RDRET_STATE),
     DEFINEREG(ECOSKPD),
+    DEFINEREG(GPIOA),
+    DEFINEREG(GPIOB),
+    DEFINEREG(GPIOC),
+    DEFINEREG(GPIOD),
+    DEFINEREG(GPIOE),
+    DEFINEREG(GPIOF),
+    DEFINEREG(GPIOG),
+    DEFINEREG(GPIOH),
+    DEFINEREG(GMBUS0),
+    DEFINEREG(GMBUS1),
+    DEFINEREG(GMBUS2),
+    DEFINEREG(GMBUS3),
+    DEFINEREG(GMBUS4),
+    DEFINEREG(GMBUS5),
 #if 0
     DEFINEREG2(FENCE_NEW + 0, i810_debug_fence_new),
     DEFINEREG2(FENCE_NEW + 8, i810_debug_fence_new),
diff --git a/src/i830_i2c.c b/src/i830_i2c.c
index d80229d..589a844 100644
--- a/src/i830_i2c.c
+++ b/src/i830_i2c.c
@@ -347,6 +347,10 @@ I830I2CInit(ScrnInfoPtr pScrn, I2CBusPtr *bus_ptr, int i2c_reg, char *name)
 {
     I2CBusPtr pI2CBus;
 
+    I830Ptr pI830;
+    pI830 = I830PTR(pScrn);
+    OUTREG(GMBUS0, 0);
+
     pI2CBus = xf86CreateI2CBusRec();
 
     if (!pI2CBus)


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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-drv-i810.spec	27 Feb 2008 23:30:26 -0000	1.75
+++ xorg-x11-drv-i810.spec	28 Feb 2008 18:22:05 -0000	1.76
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -22,6 +22,7 @@
 Patch2: intel-2.1.1-fix-vt-switch.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-2.1.1-fix-xv-compiz.patch
+Patch5: intel-2.1.1-efi.patch
 
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
@@ -59,6 +60,7 @@
 #patch2 -p1 -b .vtswitch
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .xv-compiz
+%patch5 -p1 -b .efi
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -124,6 +126,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Thu Feb 28 2008 Adam Jackson <ajax at redhat.com> 2.2.1-2
+- intel-2.1.1-efi.patch: Fix SDVO I2C on Mac Mini in EFI mode.
+
 * Wed Feb 27 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-1
 - Bump to 2.2.1, include build of the intel-batchbuffer branch.