intel/tools: Fix aub_file initialization in intel_dump_gpu
authorCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Mon, 12 Aug 2019 19:55:37 +0000 (12:55 -0700)
committerCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Tue, 13 Aug 2019 02:18:26 +0000 (19:18 -0700)
commit1021abab07ebb29957dec5fa0cc8e90a53efd290
tree6baa6d755e8e8ae77dd0e7d2764ee58c0f893fed
parentf0d29238df33d66ca4ee1e5f25a1edd9034f632e
intel/tools: Fix aub_file initialization in intel_dump_gpu

The `device` can be set earlier either by a command line or a by
intercepting an ioctl call to get the I915_PARAM_CHIPSET_ID done by
the application early.  In both cases `aub_file` and `devinfo` would
not be initialized.

Fix by splitting the conditions

- `device == 0`: use the FD to get both device and devinfo.
- Or `devinfo.gen == 0`: use `device` to initialize it.

And separatedly, initialize aub_file the first time it is needed.

Fixes: d594d2a0524 ("intel/tools: use device info initializer")
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/intel/tools/intel_dump_gpu.c