intel_gpu_top: access hardware before running profiling command

Without this patch, intel_gpu_top will try to get access to the hardware
after running the profiling command in the background. In case such access
fails, the main process quits, but the background one will continue
running.

So let's move this test up, so it is done before we fork.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>

diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c
index a2277cc..2c2ed39 100644 (file)
--- a/tools/intel_gpu_top.c
+++ b/tools/intel_gpu_top.c
@@ -486,6 +486,11 @@ int main(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
+       pci_dev = intel_get_pci_device();
+       devid = pci_dev->device_id;
+       intel_get_mmio(pci_dev);
+       init_instdone_definitions(devid);
+
        /* Do we have a command to run? */
        if (cmd != NULL) {
                if (output != stdout) {
@@ -514,11 +519,6 @@ int main(int argc, char **argv)
                }
        }
 
-       pci_dev = intel_get_pci_device();
-       devid = pci_dev->device_id;
-       intel_get_mmio(pci_dev);
-       init_instdone_definitions(devid);
-
        for (i = 0; i < num_instdone_bits; i++) {
                top_bits[i].bit = &instdone_bits[i];
                top_bits[i].count = 0;