diff options
| author | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-12 13:48:13 +0100 |
|---|---|---|
| committer | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-20 10:36:36 +0100 |
| commit | 8ae86621d6fff60b6e20c6b0f9b336785c935b0f (patch) | |
| tree | 12d83d267f5dafb16bcef5edec173ff57cf4dfbd /debugger | |
| parent | 1bbe0b11a40cbb8433a3863745b7023e54c36ae3 (diff) | |
lib/igt_device: Move intel_get_pci_device under igt_device
It allows us to make things a little bit more generic. Also, we now
require fd rather than doing guesswork when it comes to pci address.
v2: Use readlinkat rather than string concat, move stuff around, provide
a version that does not assert. (Chris)
v3: Print addr on failure, avoid assignment in conditionals. (Chris)
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/debug_rdata.c | 7 | ||||
| -rw-r--r-- | debugger/eudb.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/debugger/debug_rdata.c b/debugger/debug_rdata.c index 61d82d9e..fea95029 100644 --- a/debugger/debug_rdata.c +++ b/debugger/debug_rdata.c @@ -29,7 +29,6 @@ #include <stdio.h> #include <stdlib.h> #include "intel_io.h" -#include "intel_chipset.h" struct eu_rdata { union { @@ -133,7 +132,11 @@ find_stuck_threads(void) int main(int argc, char *argv[]) { struct pci_device *pci_dev; - pci_dev = intel_get_pci_device(); + int fd; + + fd = drm_open_driver(DRIVER_INTEL); + pci_dev = igt_device_get_pci_device(fd); + close(fd); intel_register_access_init(pci_dev, 1); find_stuck_threads(); diff --git a/debugger/eudb.c b/debugger/eudb.c index 866d4b52..b5784148 100644 --- a/debugger/eudb.c +++ b/debugger/eudb.c @@ -42,7 +42,6 @@ #include "drm.h" #include "i915_drm.h" #include "drmtest.h" -#include "intel_chipset.h" #include "intel_bufmgr.h" #include "intel_io.h" #include "intel_batchbuffer.h" @@ -506,7 +505,7 @@ int main(int argc, char* argv[]) { struct pci_device *pci_dev; volatile uint8_t *scratch = NULL; int bits[64]; - int devid = -1, opt; + int devid = -1, opt, fd; while ((opt = getopt(argc, argv, "cdr:pf?h")) != -1) { switch (opt) { @@ -533,7 +532,10 @@ int main(int argc, char* argv[]) { } } - pci_dev = intel_get_pci_device(); + fd = drm_open_driver(DRIVER_INTEL); + pci_dev = igt_device_get_pci_device(fd); + close(fd); + if (devid == -1) devid = pci_dev->device_id; if (identify_device(devid)) { |