configure.ac | 2 -
man/i740.man | 2 -
src/i740_driver.c | 84 +++++++++++++++++-------------------------------------
3 files changed, 29 insertions(+), 59 deletions(-)
New commits:
commit 85dbf1b7a259b8b8b3f378326ca7efa82752d1c0
Author: Adam Jackson <a...@redhat.com>
Date: Thu Mar 19 15:26:34 2009 -0400
i740 1.3.0
diff --git a/configure.ac b/configure.ac
index 04939fe..ec48aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i740],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i740)
commit 5a99ac561a0cdfafc09b98cecb429fe712edd42d
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Fri Jan 9 16:29:11 2009 -0800
Remove xorgconfig & xorgcfg from See Also list in man page
diff --git a/man/i740.man b/man/i740.man
index 6e725a4..8d5585c 100644
--- a/man/i740.man
+++ b/man/i740.man
@@ -25,6 +25,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for
general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1),
Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
commit 3d15d37fa05b8e27f0aeb114cc5ba419a85b5124
Author: Adam Jackson <a...@redhat.com>
Date: Fri Aug 15 15:45:52 2008 -0400
Uncomment DDC2 code, move it before mode validation so DDC has some effect.
diff --git a/src/i740_driver.c b/src/i740_driver.c
index 8d66f22..f6a0688 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -47,10 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* DGA
*/
-#ifndef USE_DDC2
-#define USE_DDC2 0
-#endif
-
/*
* These are X and server generic header files.
*/
@@ -239,22 +235,6 @@ static const char *vbeSymbols[] = {
};
#endif
-#if USE_DDC2
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-#endif
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(i740Setup);
@@ -297,9 +277,6 @@ i740Setup(pointer module, pointer opts, int *errmaj, int
*errmin)
*/
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
ramdacSymbols, vbeSymbols,
-#if USE_DDC2
- ddcSymbols, i2cSymbols,
-#endif
NULL);
/*
@@ -454,6 +431,7 @@ I740Probe(DriverPtr drv, int flags) {
return foundScreen;
}
+/* Ugh. Can we not do this? */
static void
I740ProbeDDC(ScrnInfoPtr pScrn, int index)
{
@@ -745,6 +723,32 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
clockRanges->interlaceAllowed = FALSE; /*PL*/
clockRanges->doubleScanAllowed = TRUE; /*PL*/
+ { /*PL*/
+
+ if (xf86LoadSubModule(pScrn, "ddc")) {
+ if (xf86LoadSubModule(pScrn, "i2c") ) {
+ if (I740MapMem(pScrn)) {
+ if (I740_I2CInit(pScrn))
+ {
+ xf86MonPtr MonInfo;
+ if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)))
{
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
+ MonInfo);
+ xf86PrintEDID( MonInfo );
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
+ "info\n\n");
+ xf86SetDDCproperties(pScrn,MonInfo);
+ }
+ }
+ else
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
+
+ I740UnmapMem(pScrn);
+ }
+ }
+ }
+ }
+
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, clockRanges,
0, 320, 1600,
@@ -819,40 +823,6 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
pI740->usevgacompat=FALSE;
-#if USE_DDC2 /*DDC2*/
- { /*PL*/
-
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
-
- if (I740MapMem(pScrn))
- {
- if (I740_I2CInit(pScrn))
- {
- xf86MonPtr MonInfo;
-
- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)))
{
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
- MonInfo);
- xf86PrintEDID( MonInfo );
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
- "info\n\n");
- xf86SetDDCproperties(pScrn,MonInfo);
- }
-
- //xf86SetDDCproperties(pScrn,xf86PrintEDID(
xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)));
- }
- else
- xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
-
- I740UnmapMem(pScrn);
- }
- }
- }
- }
-#endif /*DDC2*/
{ /* Overlay */
pI740->colorKey = (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
