From 547d11de54c6863dc73446181b80f4f368808c3c Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 30 Nov 2020 12:40:34 -0800
Subject: [PATCH] etnaviv, v3d: Fix valgrind include paths.

dep_valgrind gives you -I/usr/include/valgrind (or whatever) so if
valgrind/ wasn't in the search path anyway, these includes would fail.
Found in CI when adding valgrind to the build images.

Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7936>
---
 src/broadcom/vulkan/v3dv_private.h | 4 ++--
 src/etnaviv/drm/etnaviv_priv.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 3d806d6d4a1..0f0b15c9cc2 100644
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -41,8 +41,8 @@
 #include <xf86drm.h>
 
 #ifdef HAVE_VALGRIND
-#include <valgrind/valgrind.h>
-#include <valgrind/memcheck.h>
+#include <valgrind.h>
+#include <memcheck.h>
 #define VG(x) x
 #else
 #define VG(x) ((void)0)
diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h
index e3a857b0824..65a88c72849 100644
--- a/src/etnaviv/drm/etnaviv_priv.h
+++ b/src/etnaviv/drm/etnaviv_priv.h
@@ -217,7 +217,7 @@ static inline void get_abs_timeout(struct drm_etnaviv_timespec *tv, uint64_t ns)
 }
 
 #if HAVE_VALGRIND
-#  include <valgrind/memcheck.h>
+#  include <memcheck.h>
 
 /*
  * For tracking the backing memory (if valgrind enabled, we force a mmap