xf86-video-intel: 2 commits - configure.ac src/bios_reader/Makefile.am src/ch7017/ch7017.c src/Makefile.am src/sil164/sil164.c src/tfp410/tfp410.c

[Eric Anholt]

 configure.ac                |    8 +++++++-
 src/Makefile.am             |    2 +-
 src/bios_reader/Makefile.am |    2 +-
 src/ch7017/ch7017.c         |    2 --
 src/sil164/sil164.c         |    2 --
 src/tfp410/tfp410.c         |   10 +++++-----
 6 files changed, 14 insertions(+), 12 deletions(-)

New commits:
diff-tree 219354af212c7b68c20df689692c55331e36a705 (from 1b83e5e589105d05c1b78032fa47eecee478cb99)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Oct 1 16:09:13 2007 -0700

    Restore building of pciaccess-based tools even if the server doesn't use it.

diff --git a/configure.ac b/configure.ac
index 1c7ad04..e5a7cf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,9 +116,15 @@ CFLAGS="$save_CFLAGS"
 
 if test x$XSERVER_LIBPCIACCESS = xyes; then
 	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+else
+	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.5.0],
+				       have_libpciaccess=yes,
+				       have_libpciaccess=no)
 fi
-
+have_libpciaccess=no
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+AM_CONDITIONAL(LIBPCIACCESS,
+	test "x$XSERVER_LIBPCIACCESS" = xyes -o "x$have_libpciaccess" = xyes)
 AM_CONDITIONAL(XMODES, test "x$XMODES" = xno)
 
 if test "x$XSERVER_SOURCE" = x; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 13cbf91..118d4b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-if XSERVER_LIBPCIACCESS
+if LIBPCIACCESS
 REGDUMPER = reg_dumper
 endif
 
diff --git a/src/bios_reader/Makefile.am b/src/bios_reader/Makefile.am
index a4adecb..76ad15f 100644
--- a/src/bios_reader/Makefile.am
+++ b/src/bios_reader/Makefile.am
@@ -2,7 +2,7 @@ AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ 
 
 noinst_PROGRAMS = bios_reader  $(BIOS_DUMPER)
 
-if XSERVER_LIBPCIACCESS
+if LIBPCIACCESS
 BIOS_DUMPER = bios_dumper
 
 bios_dumper_SOURCES = bios_dumper.c
diff-tree 1b83e5e589105d05c1b78032fa47eecee478cb99 (from 29d3188ee9676f697f6fcb859c7f680f5df30318)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Oct 1 14:32:28 2007 -0700

    Remove more DVO probing noise.

diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 4c9b4c6..ceb8a2a 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -94,8 +94,6 @@ ch7017_init(I2CBusPtr b, I2CSlaveAddr ad
     struct ch7017_priv *priv;
     CARD8 val;
 
-    xf86DrvMsg(b->scrnIndex, X_INFO, "detecting ch7017\n");
-
     priv = xcalloc(1, sizeof(struct ch7017_priv));
     if (priv == NULL)
 	return NULL;
diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c
index c774a56..12fe8e2 100644
--- a/src/sil164/sil164.c
+++ b/src/sil164/sil164.c
@@ -81,8 +81,6 @@ sil164_init(I2CBusPtr b, I2CSlaveAddr ad
     SIL164Ptr sil;
     unsigned char ch;
 
-    xf86DrvMsg(b->scrnIndex, X_ERROR, "detecting sil164\n");
-
     sil = xcalloc(1, sizeof(SIL164Rec));
     if (sil == NULL)
 	return NULL;
diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c
index bc0ad74..b79fd2a 100644
--- a/src/tfp410/tfp410.c
+++ b/src/tfp410/tfp410.c
@@ -93,8 +93,6 @@ tfp410_init(I2CBusPtr b, I2CSlaveAddr ad
     TFP410Ptr tfp;
     int id;
 
-    xf86DrvMsg(b->scrnIndex, X_INFO, "detecting tfp410\n");
-
     tfp = xcalloc(1, sizeof(TFP410Rec));
     if (tfp == NULL)
 	return NULL;
@@ -110,9 +108,11 @@ tfp410_init(I2CBusPtr b, I2CSlaveAddr ad
     tfp->quiet = TRUE;
 
     if ((id = tfp410GetID(tfp, TFP410_VID_LO)) != TFP410_VID) {
-	xf86DrvMsg(tfp->d.pI2CBus->scrnIndex, X_ERROR,
-		   "tfp410 not detected got VID %X: from %s Slave %d.\n",
-		   id, tfp->d.pI2CBus->BusName, tfp->d.SlaveAddr);
+	if (id != 0xffffffff) {
+	    xf86DrvMsg(tfp->d.pI2CBus->scrnIndex, X_ERROR,
+		       "tfp410 not detected got VID %X: from %s Slave %d.\n",
+		       id, tfp->d.pI2CBus->BusName, tfp->d.SlaveAddr);
+	}
 	goto out;
     }