From 1cb702def4902fd35b31139ee3f65df1b0c2aec4 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Thu, 16 Feb 2023 11:43:20 -0800
Subject: [PATCH] turnip: Move things to prep for multi-kernel support

The end goal is a single build that supports kgsl (non-drm) as well
as msm and virtgpu (both drm).  First lets move around some files to
accomodate that.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21394>
---
 src/freedreno/vulkan/meson.build                    | 4 ++--
 src/freedreno/vulkan/tu_cs.h                        | 2 +-
 src/freedreno/vulkan/{tu_drm.h => tu_knl.h}         | 0
 src/freedreno/vulkan/{tu_drm.c => tu_knl_drm_msm.c} | 2 +-
 src/freedreno/vulkan/{tu_kgsl.c => tu_knl_kgsl.c}   | 2 +-
 src/freedreno/vulkan/tu_perfetto.cc                 | 2 +-
 src/freedreno/vulkan/tu_pipeline.c                  | 2 +-
 src/freedreno/vulkan/tu_suballoc.h                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/freedreno/vulkan/{tu_drm.h => tu_knl.h} (100%)
 rename src/freedreno/vulkan/{tu_drm.c => tu_knl_drm_msm.c} (99%)
 rename src/freedreno/vulkan/{tu_kgsl.c => tu_knl_kgsl.c} (99%)

diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index 421c2ffca49..b323b74d954 100644
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -70,9 +70,9 @@ if with_freedreno_kgsl
   tu_flags += '-DTU_USE_KGSL'
   # Even if libdrm is available we shouldn't use it in KGSL build
   tu_flags += '-UHAVE_LIBDRM'
-  libtu_files += files('tu_kgsl.c')
+  libtu_files += files('tu_knl_kgsl.c')
 else
-  libtu_files += files('tu_drm.c')
+  libtu_files += files('tu_knl_drm_msm.c')
   tu_deps += dep_libdrm
 endif
 
diff --git a/src/freedreno/vulkan/tu_cs.h b/src/freedreno/vulkan/tu_cs.h
index 23388856e91..b921e200afa 100644
--- a/src/freedreno/vulkan/tu_cs.h
+++ b/src/freedreno/vulkan/tu_cs.h
@@ -10,7 +10,7 @@
 
 #include "freedreno_pm4.h"
 
-#include "tu_drm.h"
+#include "tu_knl.h"
 
 /* For breadcrumbs we may open a network socket based on the envvar,
  * it's not something that should be enabled by default.
diff --git a/src/freedreno/vulkan/tu_drm.h b/src/freedreno/vulkan/tu_knl.h
similarity index 100%
rename from src/freedreno/vulkan/tu_drm.h
rename to src/freedreno/vulkan/tu_knl.h
diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_knl_drm_msm.c
similarity index 99%
rename from src/freedreno/vulkan/tu_drm.c
rename to src/freedreno/vulkan/tu_knl_drm_msm.c
index d757a92f6c3..48fb0801658 100644
--- a/src/freedreno/vulkan/tu_drm.c
+++ b/src/freedreno/vulkan/tu_knl_drm_msm.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "tu_drm.h"
+#include "tu_knl.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/freedreno/vulkan/tu_kgsl.c b/src/freedreno/vulkan/tu_knl_kgsl.c
similarity index 99%
rename from src/freedreno/vulkan/tu_kgsl.c
rename to src/freedreno/vulkan/tu_knl_kgsl.c
index 631b1006b74..c8aefb7575f 100644
--- a/src/freedreno/vulkan/tu_kgsl.c
+++ b/src/freedreno/vulkan/tu_knl_kgsl.c
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "tu_drm.h"
+#include "tu_knl.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/freedreno/vulkan/tu_perfetto.cc b/src/freedreno/vulkan/tu_perfetto.cc
index 941dc23eee7..5e33537956d 100644
--- a/src/freedreno/vulkan/tu_perfetto.cc
+++ b/src/freedreno/vulkan/tu_perfetto.cc
@@ -13,7 +13,7 @@
 #include "tu_tracepoints.h"
 #include "tu_tracepoints_perfetto.h"
 
-/* we can't include tu_drm.h and tu_device.h */
+/* we can't include tu_knl.h and tu_device.h */
 extern "C" {
 int
 tu_device_get_gpu_timestamp(struct tu_device *dev,
diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 23d5b9147e5..2fdb466c57d 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -26,7 +26,7 @@
 #include "tu_cmd_buffer.h"
 #include "tu_cs.h"
 #include "tu_device.h"
-#include "tu_drm.h"
+#include "tu_knl.h"
 #include "tu_formats.h"
 #include "tu_lrz.h"
 #include "tu_pass.h"
diff --git a/src/freedreno/vulkan/tu_suballoc.h b/src/freedreno/vulkan/tu_suballoc.h
index 5c217215ccf..b706d50ee78 100644
--- a/src/freedreno/vulkan/tu_suballoc.h
+++ b/src/freedreno/vulkan/tu_suballoc.h
@@ -12,7 +12,7 @@
 
 #include "tu_common.h"
 
-#include "tu_drm.h"
+#include "tu_knl.h"
 
 /* externally-synchronized BO suballocator. */
 struct tu_suballocator