From 65368d2f9aa926ac72f20317c4d45577be420c11 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sun, 16 Jan 2022 20:02:59 -0500
Subject: [PATCH] asahi: Don't redefine MIN2/MAX2

The tiling function was written before the Mesa driver...

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14903>
---
 src/asahi/lib/tiling.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/asahi/lib/tiling.c b/src/asahi/lib/tiling.c
index 1ef8616..db0b84c 100644
--- a/src/asahi/lib/tiling.c
+++ b/src/asahi/lib/tiling.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include "util/macros.h"
 #include "tiling.h"
 
 /* Z-order with 64x64 tiles:
@@ -61,9 +62,6 @@
 /* mask of bits used for X coordinate in a tile */
 #define SPACE_MASK 0x555 // 0b010101010101
 
-#define MAX2(x, y) (((x) > (y)) ? (x) : (y))
-#define MIN2(x, y) (((x) < (y)) ? (x) : (y))
-
 static uint32_t
 agx_space_bits(unsigned x)
 {
-- 
2.7.4