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 /tools/intel_display_poller.c | |
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 'tools/intel_display_poller.c')
-rw-r--r-- | tools/intel_display_poller.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c index 51f5b9a5..293574f2 100644 --- a/tools/intel_display_poller.c +++ b/tools/intel_display_poller.c @@ -36,6 +36,7 @@ #include "intel_io.h" #include "intel_reg.h" #include "igt_debugfs.h" +#include "igt_device.h" #include "drmtest.h" #include "igt_aux.h" @@ -971,6 +972,7 @@ int main(int argc, char *argv[]) uint32_t a, b; enum test test = TEST_INVALID; const int count = ARRAY_SIZE(min)/2; + int fd; for (;;) { static const struct option long_options[] = { @@ -1046,7 +1048,8 @@ int main(int argc, char *argv[]) } } - devid = intel_get_pci_device()->device_id; + fd = drm_open_driver(DRIVER_INTEL); + devid = igt_device_get_pci_device(fd)->device_id; /* * check if the requires registers are @@ -1187,7 +1190,7 @@ int main(int argc, char *argv[]) break; } - intel_register_access_init(intel_get_pci_device(), 0, -1); + intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); printf("%s?\n", test_name(test, pipe, bit, test_pixelcount)); @@ -1263,6 +1266,7 @@ int main(int argc, char *argv[]) } intel_register_access_fini(); + close(fd); if (quit) return 0; |