fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/dump_gpu: Add an ensure_device_info helper

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4250>
This commit is contained in:
Jason Ekstrand 2020-03-19 16:44:56 -05:00 • committed by Marge Bot
parent be451f71ab
commit 7fd4184378
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/intel/tools/intel_dump_gpu.c
View file

@ -116,6 +116,20 @@ static struct gen_device_info devinfo = {0};
static int device = 0;
static struct aub_file aub_file;
static void
ensure_device_info(int fd)
{
/* We can't do this at open time as we're not yet authenticated. */
if (device == 0) {
fail_if(!gen_get_device_info_from_fd(fd, &devinfo),
"failed to identify chipset.\n");
device = devinfo.chipset_id;
} else if (devinfo.gen == 0) {
fail_if(!gen_get_device_info_from_pci_id(device, &devinfo),
"failed to identify chipset.\n");
}
}
static void *
relocate_bo(int fd, struct bo *bo, const struct drm_i915_gem_execbuffer2 *execbuffer2,
const struct drm_i915_gem_exec_object2 *obj)
@ -202,15 +216,7 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
int batch_index;
void *data;
/* We can't do this at open time as we're not yet authenticated. */
if (device == 0) {
fail_if(!gen_get_device_info_from_fd(fd, &devinfo),
"failed to identify chipset.\n");
device = devinfo.chipset_id;
} else if (devinfo.gen == 0) {
fail_if(!gen_get_device_info_from_pci_id(device, &devinfo),
"failed to identify chipset.\n");
}
ensure_device_info(fd);
if (!aub_file.file) {
aub_file_init(&aub_file, output_file,
@ -470,6 +476,8 @@ ioctl(int fd, unsigned long request, ...)
case DRM_IOCTL_I915_GETPARAM: {
struct drm_i915_getparam *getparam = argp;
ensure_device_info(fd);
if (getparam->param == I915_PARAM_CHIPSET_ID)
return get_pci_id(fd, getparam->value);