[Mesa-dev] [PATCH] intel: tools: dump: only store device id on success

Lionel Landwerlin lionel.g.landwerlin at intel.com
Tue Jul 24 20:11:57 UTC 2018


We might fail on master node drm fd because we won't have the right
permissions.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
 src/intel/tools/intel_dump_gpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 1abe54147cf..a71103f1889 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -111,7 +111,7 @@ align_u32(uint32_t v, uint32_t a)
 }
 
 static struct gen_device_info devinfo = {0};
-static uint32_t device;
+static uint32_t device = 0;
 static struct aub_file aub_file;
 
 static void *
@@ -419,7 +419,7 @@ ioctl(int fd, unsigned long request, ...)
           * (they typically do), we'll piggy-back on
           * their ioctl and store the id for later
           * use. */
-         if (getparam->param == I915_PARAM_CHIPSET_ID)
+         if (ret == 0 && getparam->param == I915_PARAM_CHIPSET_ID)
             device = *getparam->value;
 
          return ret;
-- 
2.18.0



More information about the mesa-dev mailing list