From d9477f994a9f64b1bdd54d402bd39ea13fc55f02 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Tue, 12 Dec 2023 14:28:53 +0100
Subject: [PATCH] panfrost: Move pan_{bo,device}.{c,h} to the gallium driver
 dir

We've refactored the common lib and panvk so they no longer depend
on panfrost_{device,bo}.{c,h}. Let's move those files to the gallium
driver dir so we're not tempted to use them again.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26698>
---
 src/gallium/drivers/panfrost/meson.build                    | 2 ++
 src/{panfrost/lib => gallium/drivers/panfrost}/pan_bo.c     | 2 +-
 src/{panfrost/lib => gallium/drivers/panfrost}/pan_bo.h     | 0
 src/{panfrost/lib => gallium/drivers/panfrost}/pan_device.c | 0
 src/{panfrost/lib => gallium/drivers/panfrost}/pan_device.h | 0
 src/panfrost/lib/meson.build                                | 2 --
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{panfrost/lib => gallium/drivers/panfrost}/pan_bo.c (99%)
 rename src/{panfrost/lib => gallium/drivers/panfrost}/pan_bo.h (100%)
 rename src/{panfrost/lib => gallium/drivers/panfrost}/pan_device.c (100%)
 rename src/{panfrost/lib => gallium/drivers/panfrost}/pan_device.h (100%)

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 58fd5d10b75..b953ea006ed 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -21,6 +21,8 @@
 
 files_panfrost = files(
   'pan_afbc_cso.c',
+  'pan_bo.c',
+  'pan_device.c',
   'pan_disk_cache.c',
   'pan_fence.c',
   'pan_helpers.c',
diff --git a/src/panfrost/lib/pan_bo.c b/src/gallium/drivers/panfrost/pan_bo.c
similarity index 99%
rename from src/panfrost/lib/pan_bo.c
rename to src/gallium/drivers/panfrost/pan_bo.c
index ab26b2b5ddc..ac340124a4f 100644
--- a/src/panfrost/lib/pan_bo.c
+++ b/src/gallium/drivers/panfrost/pan_bo.c
@@ -83,7 +83,7 @@ panfrost_bo_alloc(struct panfrost_device *dev, size_t size, uint32_t flags,
    assert(kmod_bo);
 
    bo = pan_lookup_bo(dev, kmod_bo->handle);
-   assert(!memcmp(bo, &((struct panfrost_bo){}), sizeof(*bo)));
+   assert(!memcmp(bo, &((struct panfrost_bo){0}), sizeof(*bo)));
    bo->kmod_bo = kmod_bo;
 
    struct pan_kmod_vm_op vm_op = {
diff --git a/src/panfrost/lib/pan_bo.h b/src/gallium/drivers/panfrost/pan_bo.h
similarity index 100%
rename from src/panfrost/lib/pan_bo.h
rename to src/gallium/drivers/panfrost/pan_bo.h
diff --git a/src/panfrost/lib/pan_device.c b/src/gallium/drivers/panfrost/pan_device.c
similarity index 100%
rename from src/panfrost/lib/pan_device.c
rename to src/gallium/drivers/panfrost/pan_device.c
diff --git a/src/panfrost/lib/pan_device.h b/src/gallium/drivers/panfrost/pan_device.h
similarity index 100%
rename from src/panfrost/lib/pan_device.h
rename to src/gallium/drivers/panfrost/pan_device.h
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index e15cfed41f3..272da453cf9 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -73,10 +73,8 @@ libpanfrost_lib_files = files(
 
   'pan_afbc.c',
   'pan_attributes.c',
-  'pan_bo.c',
   'pan_blend.c',
   'pan_clear.c',
-  'pan_device.c',
   'pan_earlyzs.c',
   'pan_samples.c',
   'pan_tiler.c',