xf86-video-intel: 3 commits - src/bios_reader/bios_dumper.c src/i830_dvo.c src/reg_dumper/main.c src/reg_dumper/reg_dumper.h

[Eric Anholt]

 src/bios_reader/bios_dumper.c |    6 +++---
 src/i830_dvo.c                |    2 +-
 src/reg_dumper/main.c         |    6 +++---
 src/reg_dumper/reg_dumper.h   |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
diff-tree 9d6d9ace4bd3180a4484321c3b96a83bc4adaf84 (from a117bc9e3eb824f2056ee6416859ea3ab1fdcc30)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Mar 16 19:41:54 2007 -0700

    Move vendor ID check in the utils to after pci_device_probe.
    
    Even current libpciaccess seems to require this.

diff --git a/src/bios_reader/bios_dumper.c b/src/bios_reader/bios_dumper.c
index 071419b..c0dbdcf 100644
--- a/src/bios_reader/bios_dumper.c
+++ b/src/bios_reader/bios_dumper.c
@@ -60,15 +60,15 @@ int main(int argc, char **argv)
     if (dev == NULL)
 	errx(1, "Couldn't find graphics card");
 
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
     err = pci_device_probe(dev);
     if (err != 0) {
 	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
 	exit(1);
     }
 
+    if (dev->vendor_id != 0x8086)
+	errx(1, "Graphics card is non-intel");
+
     bios = malloc(dev->rom_size);
     if (bios == NULL)
 	errx(1, "Couldn't allocate memory for BIOS data\n");
diff --git a/src/reg_dumper/main.c b/src/reg_dumper/main.c
index 50c7923..b3c50de 100644
--- a/src/reg_dumper/main.c
+++ b/src/reg_dumper/main.c
@@ -52,15 +52,15 @@ int main(int argc, char **argv)
     if (dev == NULL)
 	errx(1, "Couldn't find graphics card");
 
-    if (dev->vendor_id != 0x8086)
-	errx(1, "Graphics card is non-intel");
-
     err = pci_device_probe(dev);
     if (err != 0) {
 	fprintf(stderr, "Couldn't probe graphics card: %s\n", strerror(err));
 	exit(1);
     }
 
+    if (dev->vendor_id != 0x8086)
+	errx(1, "Graphics card is non-intel");
+
     i830.PciInfo = &i830.pci_info_rec;
     i830.PciInfo->chipType = dev->device_id;
 
diff-tree a117bc9e3eb824f2056ee6416859ea3ab1fdcc30 (from 29446cdb4f72e12c5249b0d4b79ea56d9fe19934)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Mar 16 19:39:34 2007 -0700

    Add the (afaict) correct ch7017 I2C slave address.

diff --git a/src/i830_dvo.c b/src/i830_dvo.c
index 629e9c7..04750e5 100644
--- a/src/i830_dvo.c
+++ b/src/i830_dvo.c
@@ -72,7 +72,7 @@ struct _I830DVODriver i830_dvo_drivers[]
     */
     /*
     { I830_DVO_CHIP_LVDS, "ch7017", "ch7017_methods",
-      (CH7017_ADDR_1 << 1), ch7017_symbols, NULL, NULL, NULL }
+      0xea, ch7017_symbols, NULL, NULL, NULL }
     */
 };
 
diff-tree 29446cdb4f72e12c5249b0d4b79ea56d9fe19934 (from 213394fbaaf353404cbb3aaa4c20860f48ee1079)
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Mar 16 19:18:37 2007 -0700

    Fix compile failure due to needed types being in inttypes.h on Linux.

diff --git a/src/reg_dumper/reg_dumper.h b/src/reg_dumper/reg_dumper.h
index a52d662..07ddf6f 100644
--- a/src/reg_dumper/reg_dumper.h
+++ b/src/reg_dumper/reg_dumper.h
@@ -25,7 +25,7 @@
  *
  */
 
-#include <sys/types.h>
+#include <inttypes.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>