summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-04-12 15:57:07 -0700
committerEric Anholt <eric@anholt.net>2009-04-12 15:57:07 -0700
commit593a47f00e3c9cb3f748daae7d3fe04427c7e0c2 (patch)
tree229785a6381ff68beb69ddaef6ac7f4c06136242 /lib
parentb51588b9bd8a1a18a77d354b1c9fe4c841dff0f3 (diff)
intel_gpu_dump: Get the devid so we can decode correctly on gen4.
Diffstat (limited to 'lib')
-rw-r--r--lib/intel_gpu_tools.c12
-rw-r--r--lib/intel_gpu_tools.h1
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/intel_gpu_tools.c b/lib/intel_gpu_tools.c
index 3c2d65be..6c85d2a1 100644
--- a/lib/intel_gpu_tools.c
+++ b/lib/intel_gpu_tools.c
@@ -54,10 +54,9 @@ intel_get_drm_devid(int fd)
}
void
-intel_get_mmio(void)
+intel_get_pci_device(void)
{
int err;
- int mmio_bar;
err = pci_system_init();
if (err != 0) {
@@ -81,6 +80,15 @@ intel_get_mmio(void)
if (pci_dev->vendor_id != 0x8086)
errx(1, "Graphics card is non-intel");
devid = pci_dev->device_id;
+}
+
+void
+intel_get_mmio(void)
+{
+ int mmio_bar;
+ int err;
+
+ intel_get_pci_device();
if (IS_9XX(devid))
mmio_bar = 0;
diff --git a/lib/intel_gpu_tools.h b/lib/intel_gpu_tools.h
index c1064a31..d696d72a 100644
--- a/lib/intel_gpu_tools.h
+++ b/lib/intel_gpu_tools.h
@@ -42,6 +42,7 @@ INREG(uint32_t reg)
return *(volatile uint32_t *)((volatile char *)mmio + reg);
}
+void intel_get_pci_device(void);
void intel_get_mmio(void);
void intel_get_drm_devid(int fd);
void intel_copy_bo(struct intel_batchbuffer *batch,