Mesa (master): anv: fix error message

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Oct 24 13:58:35 UTC 2019


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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Thu Oct 24 13:04:51 2019 +0100

anv: fix error message

`strerror()` takes an `errno`, not the negative value returned by the
`ioctl()`.
Instead of fixing this as `"%s", strerror(errno)`, let's just use the
`"%m"` shortcut for it.

Fixes: 2b5f30b1d91b98ab27ba ("anv: implement VK_INTEL_performance_query")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/vulkan/anv_perf.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/intel/vulkan/anv_perf.c b/src/intel/vulkan/anv_perf.c
index 6a9fb4f6f11..a6b94203422 100644
--- a/src/intel/vulkan/anv_perf.c
+++ b/src/intel/vulkan/anv_perf.c
@@ -202,11 +202,8 @@ VkResult anv_QueueSetPerformanceConfigurationINTEL(
    } else {
       int ret = gen_ioctl(device->perf_fd, I915_PERF_IOCTL_CONFIG,
                           (void *)(uintptr_t) _configuration);
-      if (ret < 0) {
-         return anv_device_set_lost(device,
-                                    "i915-perf config failed: %s",
-                                    strerror(ret));
-      }
+      if (ret < 0)
+         return anv_device_set_lost(device, "i915-perf config failed: %m");
    }
 
    return VK_SUCCESS;




More information about the mesa-commit mailing list