From 83303aa05dc2b7d2883dd54fadb4fa419dbb1858 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Date: Thu, 30 Oct 2025 15:01:53 -0400
Subject: [PATCH] pvr: don't NIH alignment helpers

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38169>
---
 src/imagination/common/pvr_util.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/imagination/common/pvr_util.h b/src/imagination/common/pvr_util.h
index f94a319a80d..45c40c57a7d 100644
--- a/src/imagination/common/pvr_util.h
+++ b/src/imagination/common/pvr_util.h
@@ -30,20 +30,12 @@
 #include "pvr_types.h"
 
 #include "util/bitscan.h"
-#include "util/macros.h"
+#include "util/u_math.h"
 
 static inline bool pvr_dev_addr_is_aligned(pvr_dev_addr_t addr,
                                            const uint32_t alignment)
 {
-   assert(util_is_power_of_two_nonzero(alignment));
-   return ((uintptr_t)(addr.addr) & (alignment - 1)) == 0;
-}
-
-static inline bool ptr_is_aligned(const void *const ptr,
-                                  const uint32_t alignment)
-{
-   assert(util_is_power_of_two_nonzero(alignment));
-   return ((uintptr_t)(ptr) & (alignment - 1)) == 0;
+   return util_is_aligned(addr.addr, alignment);
 }
 
 /*****************************************************************************