Author: adamwill
Update of /cvs/nonfree/rpms/xorg-x11-drv-psb/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3831
Modified Files:
xorg-x11-drv-psb.spec
Added Files:
xorg-x11-drv-psb-0.32.0-hdmi.patch
Log Message:
* Fri Sep 18 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-5
- add hdmi.patch, from Joakim Plate: fix HDMI output
xorg-x11-drv-psb-0.32.0-hdmi.patch:
psb_outputs.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
--- NEW FILE xorg-x11-drv-psb-0.32.0-hdmi.patch ---
--- xserver-xorg-video-psb-0.32.1/src/psb_outputs.c.orig 2010-09-16 10:01:25.836640004
+0200
+++ xserver-xorg-video-psb-0.32.1/src/psb_outputs.c 2010-09-16 10:02:20.092640004 +0200
@@ -64,6 +64,28 @@ psbOutputCommit(xf86OutputPtr output)
output->funcs->dpms(output, DPMSModeOn);
}
+static int
+DDC_checksum_psb(unsigned char *block, int len)
+{
+ int i, result = 0;
+ int not_null = 0;
+
+ for (i=0;i<len;i++) {
+ not_null |= block[i];
+ result += block[i];
+ }
+
+#ifdef DEBUG
+ if (result & 0xFF) ErrorF("DDC checksum not correct\n");
+ if (!not_null) ErrorF("DDC read all Null\n");
+#endif
+
+ /* catch the trivial case where all bytes are 0 */
+ if (!not_null) return 1;
+
+ return (result&0xFF);
+}
+
/*Add this function to get the EDID data from DDC bus, got the code from Xserver
Jamesx*/
unsigned char *
psbDDCRead_DDC2(int scrnIndex, I2CBusPtr pBus, int start, int len)
@@ -107,7 +129,7 @@ psbDDCRead_DDC2(int scrnIndex, I2CBusPtr
* (len));
for (i = 0; i < 4 /*RETRIES*/; i++) {
if (xf86I2CWriteRead(dev, W_Buffer, w_bytes, R_Buffer, len)) {
- if (!DDC_checksum(R_Buffer, len))
+ if (!DDC_checksum_psb(R_Buffer, len))
return R_Buffer;
}
}
Index: xorg-x11-drv-psb.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-psb/F-13/xorg-x11-drv-psb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-psb.spec 22 Jul 2010 21:32:56 -0000 1.2
+++ xorg-x11-drv-psb.spec 17 Sep 2010 22:56:47 -0000 1.3
@@ -38,6 +38,8 @@
Patch10: xorg-x11-drv-psb-0.32.0-xv.patch
# From Yves - fix blank screen when rotating 90 degrees
Patch11: xorg-x11-drv-psb-0.32.0-rotate.patch
+# From Joakim Plate - fixes HDMI output
+Patch12: xorg-x11-drv-psb-0.32.0-hdmi.patch
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,7 +94,7 @@
%patch9 -p1 -b .mixed
%patch10 -p1 -b .xv
%patch11 -p1 -b .rotate
-
+%patch12 -p1 -b .hdmi
iconv -f iso-8859-15 -t utf-8 -o man/psb.man.utf8 man/psb.man && mv
man/psb.man.utf8 man/psb.man
@@ -146,6 +148,9 @@
%{_mandir}/man4/*.4*
%changelog
+* Fri Sep 18 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-5
+- add hdmi.patch, from Joakim Plate: fix HDMI output
+
* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 0.32.0-4
- add rotate.patch, from Yves: fixes 90 degree rotation