From 7440fbd596a70a7c04987224b484140c29325d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 15 Dec 2021 15:14:36 +0100
Subject: [PATCH] etnaviv: Use mesa_log*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Makes it consistent with the DRM bits

Signed-off-by: Guido Günther <guido.gunther@puri.sm>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Acked-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10546>
---
 src/gallium/drivers/etnaviv/etnaviv_debug.h | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_debug.h b/src/gallium/drivers/etnaviv/etnaviv_debug.h
index f8f1e21c367..a2e8474f5f5 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_debug.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_debug.h
@@ -25,7 +25,7 @@
 #ifndef H_ETNA_DEBUG
 #define H_ETNA_DEBUG
 
-#include "util/u_debug.h"
+#include "util/log.h"
 
 #include <stdint.h>
 #include <stdio.h>
@@ -62,24 +62,24 @@ extern int etna_mesa_debug; /* set in etnaviv_screen.c from ETNA_MESA_DEBUG */
 
 #define DBG_ENABLED(flag) unlikely(etna_mesa_debug & (flag))
 
-#define DBG_F(flag, fmt, ...)                                     \
-   do {                                                           \
-      if (etna_mesa_debug & (flag))                               \
-         debug_printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, \
-                      ##__VA_ARGS__);                             \
+#define DBG_F(flag, fmt, ...)                             \
+   do {                                                   \
+      if (etna_mesa_debug & (flag))                       \
+         mesa_logd("%s:%d: " fmt, __FUNCTION__, __LINE__, \
+                   ##__VA_ARGS__);                        \
    } while (0)
 
-#define DBG(fmt, ...)                                             \
-   do {                                                           \
-      if (etna_mesa_debug & ETNA_DBG_MSGS)                        \
-         debug_printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, \
-                      ##__VA_ARGS__);                             \
+#define DBG(fmt, ...)                                     \
+   do {                                                   \
+      if (etna_mesa_debug & ETNA_DBG_MSGS)                \
+         mesa_logd("%s:%d: " fmt, __FUNCTION__, __LINE__, \
+                   ##__VA_ARGS__);                        \
    } while (0)
 
 /* A serious bug, show this even in non-debug mode */
-#define BUG(fmt, ...)                                                    \
-   do {                                                                  \
-      printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); \
+#define BUG(fmt, ...)                                                  \
+   do {                                                                \
+      mesa_loge("%s:%d: " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
    } while (0)
 
 #endif