drm: fix build failure and misc .clang-format issue
drm_log relies on -Wgnu-zero-variadic-macro-arguments ignored.
Fixes: 060f4481 ("drm: Silence GCC warnings")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1165>
diff --git a/src/drm/.clang-format b/src/drm/.clang-format
index 068b217..885f701 100644
--- a/src/drm/.clang-format
+++ b/src/drm/.clang-format
@@ -19,7 +19,6 @@
ColumnLimit: 90
ContinuationIndentWidth: 3
Cpp11BracedListStyle: false
-Cpp11BracedListStyle: true
BreakStringLiterals: false
ForEachMacros:
- BITSET_FOREACH_SET
diff --git a/src/drm/drm_util.h b/src/drm/drm_util.h
index 540a07a..00f87d6 100644
--- a/src/drm/drm_util.h
+++ b/src/drm/drm_util.h
@@ -21,11 +21,11 @@
#include "linux/overflow.h"
-#pragma GCC diagnostic pop
-
void _drm_log(const char *fmt, ...);
#define drm_log(fmt, ...) _drm_log("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__)
+#pragma GCC diagnostic pop
+
#if 0
#define drm_dbg drm_log
#else
