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>

1 files changed, 10 insertions, 13 deletions

diff --git a/tools/intel_reg.c b/tools/intel_reg.c
index 1247b70b..305323b6 100644
--- a/tools/intel_reg.c
+++ b/tools/intel_reg.c
@@ -33,9 +33,9 @@
 #include <unistd.h>
 
 #include "igt.h"
+#include "igt_device.h"
 #include "igt_gt.h"
 #include "intel_io.h"
-#include "intel_chipset.h"
 
 #include "intel_reg_spec.h"
 
@@ -274,15 +274,6 @@ static int register_srm(struct config *config, struct reg *reg,
 	int fd, i;
 	uint32_t val;
 
-	if (config->fd == -1) {
-		config->fd = __drm_open_driver(DRIVER_INTEL);
-		if (config->fd == -1) {
-			fprintf(stderr, "Error opening driver: %s",
-				strerror(errno));
-			exit(EXIT_FAILURE);
-		}
-	}
-
 	fd = config->fd;
 	engine = find_engine(reg->engine);
 	if (engine == NULL)
@@ -1015,6 +1006,13 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
+	config.fd = __drm_open_driver(DRIVER_INTEL);
+	if (config.fd == -1) {
+		fprintf(stderr, "Error opening driver: %s",
+			strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
 	if (config.mmiofile) {
 		if (!config.devid) {
 			fprintf(stderr, "--mmio requires --devid\n");
@@ -1026,7 +1024,7 @@ int main(int argc, char *argv[])
 			fprintf(stderr, "--devid without --mmio\n");
 			return EXIT_FAILURE;
 		}
-		config.pci_dev = intel_get_pci_device();
+		config.pci_dev = igt_device_get_pci_device(config.fd);
 		config.devid = config.pci_dev->device_id;
 	}
 
@@ -1050,8 +1048,7 @@ int main(int argc, char *argv[])
 
 	free(config.mmiofile);
 
-	if (config.fd >= 0)
-		close(config.fd);
+	close(config.fd);
 
 	return ret;
 }