Mesa (main): entaviv/drm: Use same log format as gallium bits

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 01bb981d57c6c94e9762dbddebf4ee78ad432e84
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01bb981d57c6c94e9762dbddebf4ee78ad432e84

Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Dec 15 15:11:44 2021 +0100

entaviv/drm: Use same log format as gallium bits

We prefix with __func__:__LINE__ there.

Signed-off-by: Guido Günther <guido.gunther at puri.sm>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Acked-by: Lucas Stach <l.stach at pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10546>

---

 src/etnaviv/drm/etnaviv_priv.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etnaviv/drm/etnaviv_priv.h b/src/etnaviv/drm/etnaviv_priv.h
index d2f88f78059..6a00e9832cc 100644
--- a/src/etnaviv/drm/etnaviv_priv.h
+++ b/src/etnaviv/drm/etnaviv_priv.h
@@ -193,18 +193,18 @@ struct etna_perfmon_signal
 extern int etna_mesa_debug;
 
 #define INFO_MSG(fmt, ...) \
-		do { mesa_logi(fmt " (%s:%d)", \
-				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
+		do { mesa_logi("%s:%d: " fmt, \
+				__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
 #define DEBUG_MSG(fmt, ...) \
 		do if (etna_mesa_debug & ETNA_DRM_MSGS) { \
-		     mesa_logd(fmt " (%s:%d)", \
-				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
+		     mesa_logd("%s:%d: " fmt, \
+				__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
 #define WARN_MSG(fmt, ...) \
-		do { mesa_logw(fmt " (%s:%d)", \
-				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
+		do { mesa_logw("%s:%d: " fmt, \
+				__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
 #define ERROR_MSG(fmt, ...) \
-		do { mesa_loge(fmt " (%s:%d)", \
-				##__VA_ARGS__, __FUNCTION__, __LINE__); } while (0)
+		do { mesa_loge("%s:%d: " fmt, \
+				__FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
 
 #define DEBUG_BO(msg, bo)						\
    DEBUG_MSG("%s %p, va: 0x%.8x, size: 0x%.8x, flags: 0x%.8x, "		\