diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-27 20:52:52 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2019-03-29 22:23:27 +0200 |
| commit | e408d569973b610ba4aafdba016c48b25e563468 (patch) | |
| tree | e3e1050d63918d053369c7669b62097d501a0451 /tools/intel_display_poller.c | |
| parent | 1ac3264e0370134d06e2cff211c0da4aa5c7d83b (diff) | |
Revert "lib/igt_device: Move intel_get_pci_device under igt_device"
One significant usecase for intel_reg/etc. is to be able to examine
the hardware state *before* loading the driver. If the tool forces
the driver to load we've totally lost that capability.
This reverts commit 8ae86621d6fff60b6e20c6b0f9b336785c935b0f.
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Michał Winiarski <michal.winiarski@intel.com>
Diffstat (limited to 'tools/intel_display_poller.c')
| -rw-r--r-- | tools/intel_display_poller.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/intel_display_poller.c b/tools/intel_display_poller.c index 293574f2..51f5b9a5 100644 --- a/tools/intel_display_poller.c +++ b/tools/intel_display_poller.c @@ -36,7 +36,6 @@ #include "intel_io.h" #include "intel_reg.h" #include "igt_debugfs.h" -#include "igt_device.h" #include "drmtest.h" #include "igt_aux.h" @@ -972,7 +971,6 @@ 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[] = { @@ -1048,8 +1046,7 @@ int main(int argc, char *argv[]) } } - fd = drm_open_driver(DRIVER_INTEL); - devid = igt_device_get_pci_device(fd)->device_id; + devid = intel_get_pci_device()->device_id; /* * check if the requires registers are @@ -1190,7 +1187,7 @@ int main(int argc, char *argv[]) break; } - intel_register_access_init(igt_device_get_pci_device(fd), 0, -1); + intel_register_access_init(intel_get_pci_device(), 0, -1); printf("%s?\n", test_name(test, pipe, bit, test_pixelcount)); @@ -1266,7 +1263,6 @@ int main(int argc, char *argv[]) } intel_register_access_fini(); - close(fd); if (quit) return 0; |