[Intel-gfx] [PATCH igt 3/8] lib/igt_gt: has_gpu_reset(): fix failed assertion on non-i915 platforms
Ulrich Hecht
ulrich.hecht+renesas at gmail.com
Thu Mar 15 14:45:39 UTC 2018
Checks if we have an i915 device before using intel_get_drm_devid().
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas at gmail.com>
---
lib/igt_gt.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/lib/igt_gt.c b/lib/igt_gt.c
index e630550..9cb07c2 100644
--- a/lib/igt_gt.c
+++ b/lib/igt_gt.c
@@ -59,14 +59,17 @@ static bool has_gpu_reset(int fd)
struct drm_i915_getparam gp;
int val = 0;
- memset(&gp, 0, sizeof(gp));
- gp.param = 35; /* HAS_GPU_RESET */
- gp.value = &val;
-
- if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
- once = intel_gen(intel_get_drm_devid(fd)) >= 5;
- else
- once = val > 0;
+ if (is_i915_device(fd)) {
+ memset(&gp, 0, sizeof(gp));
+ gp.param = 35; /* HAS_GPU_RESET */
+ gp.value = &val;
+
+ if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp))
+ once = intel_gen(intel_get_drm_devid(fd)) >= 5;
+ else
+ once = val > 0;
+ } else
+ once = 0;
}
return once;
}
--
2.7.4
More information about the Intel-gfx
mailing list