Mesa (master): anv: Use fallback paths if DRM_I915_QUERY_ENGINE_INFO fails

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: df5607d2efc152072fda42739d1188e9aecd55de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=df5607d2efc152072fda42739d1188e9aecd55de

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Wed Mar 17 10:08:56 2021 -0700

anv: Use fallback paths if DRM_I915_QUERY_ENGINE_INFO fails

Anvil can handle if this call fails, but not if we assert. :)

Reported-by: Brian Paul <brianp at vmware.com>
Fixes: 5d84c764fde ("anv: Gather engine info from i915 if available")
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9664>

---

 src/intel/vulkan/anv_gem.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/intel/vulkan/anv_gem.c b/src/intel/vulkan/anv_gem.c
index ae0fb6c7075..f78070a645b 100644
--- a/src/intel/vulkan/anv_gem.c
+++ b/src/intel/vulkan/anv_gem.c
@@ -771,9 +771,7 @@ anv_gem_get_engine_info(int fd)
 {
    int32_t length = 0;
    int ret = anv_i915_query(fd, DRM_I915_QUERY_ENGINE_INFO, NULL, &length);
-   assert(ret == 0);
-
-   if (ret == -1 && errno == EINVAL)
+   if (ret == -1)
       return NULL;
 
    struct drm_i915_query_engine_info *info = calloc(1, length);