This is to consolidate all the chipset related functions to
intel_chipset.[hc].
Unfortunately we need to rename a wrapper lib file in quick_dump, too.
And quick_dump makes automake a bit unhappy apparently.
Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch>
---
lib/Makefile.sources | 2 +-
lib/intel_chipset.c | 123 ++++++++++++++++++++++++++++++++++
lib/intel_pci.c | 123 ----------------------------------
tools/quick_dump/Makefile.am | 4 +-
tools/quick_dump/chipset_macro_wrap.c | 33 +++++++++
tools/quick_dump/intel_chipset.c | 33 ---------
6 files changed, 159 insertions(+), 159 deletions(-)
create mode 100644 lib/intel_chipset.c
delete mode 100644 lib/intel_pci.c
create mode 100644 tools/quick_dump/chipset_macro_wrap.c
delete mode 100644 tools/quick_dump/intel_chipset.c
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index a3a679c1c41e..2b700c6c2726 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -18,7 +18,7 @@ libintel_tools_la_SOURCES = \
intel_drm.c \
intel_gpu_tools.h \
intel_mmio.c \
- intel_pci.c \
+ intel_chipset.c \
intel_reg.h \
ioctl_wrappers.c \
ioctl_wrappers.h \
diff --git a/lib/intel_chipset.c b/lib/intel_chipset.c
new file mode 100644
index 000000000000..e60e0d324da8
--- /dev/null
+++ b/lib/intel_chipset.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER 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.
+ *
+ * Authors:
+ * Eric Anholt <e...@anholt.net>
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <err.h>
+#include <assert.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "intel_gpu_tools.h"
+
+enum pch_type pch;
+
+struct pci_device *
+intel_get_pci_device(void)
+{
+ struct pci_device *pci_dev;
+ int error;
+
+ error = pci_system_init();
+ if (error != 0) {
+ fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+ strerror(error));
+ exit(1);
+ }
+
+ /* Grab the graphics card. Try the canonical slot first, then
+ * walk the entire PCI bus for a matching device. */
+ pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
+ if (pci_dev == NULL || pci_dev->vendor_id != 0x8086) {
+ struct pci_device_iterator *iter;
+ struct pci_id_match match;
+
+ match.vendor_id = 0x8086; /* Intel */
+ match.device_id = PCI_MATCH_ANY;
+ match.subvendor_id = PCI_MATCH_ANY;
+ match.subdevice_id = PCI_MATCH_ANY;
+
+ match.device_class = 0x3 << 16;
+ match.device_class_mask = 0xff << 16;
+
+ match.match_data = 0;
+
+ iter = pci_id_match_iterator_create(&match);
+ pci_dev = pci_device_next(iter);
+ pci_iterator_destroy(iter);
+ }
+ if (pci_dev == NULL)
+ errx(1, "Couldn't find graphics card");
+
+ error = pci_device_probe(pci_dev);
+ if (error != 0) {
+ fprintf(stderr, "Couldn't probe graphics card: %s\n",
+ strerror(error));
+ exit(1);
+ }
+
+ if (pci_dev->vendor_id != 0x8086)
+ errx(1, "Graphics card is non-intel");
+
+ return pci_dev;
+}
+
+void
+intel_check_pch(void)
+{
+ struct pci_device *pch_dev;
+
+ pch_dev = pci_device_find_by_slot(0, 0, 31, 0);
+ if (pch_dev == NULL)
+ return;
+
+ if (pch_dev->vendor_id != 0x8086)
+ return;
+
+ switch (pch_dev->device_id & 0xff00) {
+ case 0x3b00:
+ pch = PCH_IBX;
+ break;
+ case 0x1c00:
+ case 0x1e00:
+ pch = PCH_CPT;
+ break;
+ case 0x8c00:
+ case 0x9c00:
+ pch = PCH_LPT;
+ break;
+ default:
+ pch = PCH_NONE;
+ return;
+ }
+}
+
diff --git a/lib/intel_pci.c b/lib/intel_pci.c
deleted file mode 100644
index e60e0d324da8..000000000000
--- a/lib/intel_pci.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright © 2008 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER 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.
- *
- * Authors:
- * Eric Anholt <e...@anholt.net>
- *
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <err.h>
-#include <assert.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "intel_gpu_tools.h"
-
-enum pch_type pch;
-
-struct pci_device *
-intel_get_pci_device(void)
-{
- struct pci_device *pci_dev;
- int error;
-
- error = pci_system_init();
- if (error != 0) {
- fprintf(stderr, "Couldn't initialize PCI system: %s\n",
- strerror(error));
- exit(1);
- }
-
- /* Grab the graphics card. Try the canonical slot first, then
- * walk the entire PCI bus for a matching device. */
- pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
- if (pci_dev == NULL || pci_dev->vendor_id != 0x8086) {
- struct pci_device_iterator *iter;
- struct pci_id_match match;
-
- match.vendor_id = 0x8086; /* Intel */
- match.device_id = PCI_MATCH_ANY;
- match.subvendor_id = PCI_MATCH_ANY;
- match.subdevice_id = PCI_MATCH_ANY;
-
- match.device_class = 0x3 << 16;
- match.device_class_mask = 0xff << 16;
-
- match.match_data = 0;
-
- iter = pci_id_match_iterator_create(&match);
- pci_dev = pci_device_next(iter);
- pci_iterator_destroy(iter);
- }
- if (pci_dev == NULL)
- errx(1, "Couldn't find graphics card");
-
- error = pci_device_probe(pci_dev);
- if (error != 0) {
- fprintf(stderr, "Couldn't probe graphics card: %s\n",
- strerror(error));
- exit(1);
- }
-
- if (pci_dev->vendor_id != 0x8086)
- errx(1, "Graphics card is non-intel");
-
- return pci_dev;
-}
-
-void
-intel_check_pch(void)
-{
- struct pci_device *pch_dev;
-
- pch_dev = pci_device_find_by_slot(0, 0, 31, 0);
- if (pch_dev == NULL)
- return;
-
- if (pch_dev->vendor_id != 0x8086)
- return;
-
- switch (pch_dev->device_id & 0xff00) {
- case 0x3b00:
- pch = PCH_IBX;
- break;
- case 0x1c00:
- case 0x1e00:
- pch = PCH_CPT;
- break;
- case 0x8c00:
- case 0x9c00:
- pch = PCH_LPT;
- break;
- default:
- pch = PCH_NONE;
- return;
- }
-}
-
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index 1814315e0cb5..e6329c9c2980 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -7,9 +7,9 @@ bin_SCRIPTS = chipset.py
lib_LTLIBRARIES = I915ChipsetPython.la
I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
$(PCIACCESS_LIBS)
-I915ChipsetPython_la_SOURCES = chipset_wrap_python.c intel_chipset.c \
+I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \
$(top_srcdir)/lib/intel_drm.c \
- $(top_srcdir)/lib/intel_pci.c \
+ $(top_srcdir)/lib/intel_chipset.c \
$(top_srcdir)/lib/intel_reg_map.c \
$(top_srcdir)/lib/intel_mmio.c \
$(top_srcdir)/lib/intel_iosf.c
diff --git a/tools/quick_dump/chipset_macro_wrap.c
b/tools/quick_dump/chipset_macro_wrap.c
new file mode 100644
index 000000000000..392b85eca2e4
--- /dev/null
+++ b/tools/quick_dump/chipset_macro_wrap.c
@@ -0,0 +1,33 @@
+#include <pciaccess.h>
+#include "intel_chipset.h"
+
+int is_sandybridge(unsigned short pciid)
+{
+ return IS_GEN6(pciid);
+}
+
+int is_ivybridge(unsigned short pciid)
+{
+ return IS_IVYBRIDGE(pciid);
+}
+
+int is_valleyview(unsigned short pciid)
+{
+ return IS_VALLEYVIEW(pciid);
+}
+
+int is_haswell(unsigned short pciid)
+{
+ return IS_HASWELL(pciid);
+}
+
+int is_broadwell(unsigned short pciid)
+{
+ return IS_BROADWELL(pciid);
+}
+
+/* Simple helper because I couldn't make this work in the script */
+unsigned short pcidev_to_devid(struct pci_device *pdev)
+{
+ return pdev->device_id;
+}
diff --git a/tools/quick_dump/intel_chipset.c b/tools/quick_dump/intel_chipset.c
deleted file mode 100644
index 392b85eca2e4..000000000000
--- a/tools/quick_dump/intel_chipset.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <pciaccess.h>
-#include "intel_chipset.h"
-
-int is_sandybridge(unsigned short pciid)
-{
- return IS_GEN6(pciid);
-}
-
-int is_ivybridge(unsigned short pciid)
-{
- return IS_IVYBRIDGE(pciid);
-}
-
-int is_valleyview(unsigned short pciid)
-{
- return IS_VALLEYVIEW(pciid);
-}
-
-int is_haswell(unsigned short pciid)
-{
- return IS_HASWELL(pciid);
-}
-
-int is_broadwell(unsigned short pciid)
-{
- return IS_BROADWELL(pciid);
-}
-
-/* Simple helper because I couldn't make this work in the script */
-unsigned short pcidev_to_devid(struct pci_device *pdev)
-{
- return pdev->device_id;
-}
--
1.8.5.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
