Mesa (main): gallium: move radeon_winsys.h into gallium/include/winsys/

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Apr 17 02:00:43 UTC 2022 

Module: Mesa
Branch: main
Commit: efac875b666f9f4f22ac216b52df8441c56d8114
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=efac875b666f9f4f22ac216b52df8441c56d8114

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Apr 12 19:06:24 2022 -0400

gallium: move radeon_winsys.h into gallium/include/winsys/

it's used by 3 different drivers, so it shouldn't be in radeonsi

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Reviewed-by: Mihai Preda <mhpreda at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15907>

---

 .gitlab-ci/test-source-dep.yml                                   | 1 +
 src/gallium/auxiliary/target-helpers/drm_helper.h                | 4 ++--
 src/gallium/drivers/r300/r300_chipset.c                          | 2 +-
 src/gallium/drivers/r300/r300_screen.h                           | 2 +-
 src/gallium/drivers/r600/r600_pipe_common.h                      | 2 +-
 src/gallium/drivers/r600/radeon_uvd.h                            | 2 +-
 src/gallium/drivers/r600/radeon_video.h                          | 2 +-
 src/gallium/drivers/radeonsi/meson.build                         | 1 -
 src/gallium/drivers/radeonsi/radeon_uvd.h                        | 2 +-
 src/gallium/drivers/radeonsi/radeon_video.h                      | 2 +-
 src/gallium/drivers/radeonsi/si_pm4.h                            | 2 +-
 src/gallium/{drivers/radeonsi => include/winsys}/radeon_winsys.h | 0
 src/gallium/targets/pipe-loader/pipe_r300.c                      | 2 +-
 src/gallium/targets/pipe-loader/pipe_r600.c                      | 2 +-
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h                    | 2 +-
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.h                | 2 +-
 16 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index f2d0b90f400..ed689eaee27 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -443,6 +443,7 @@
       when: on_success
     - changes: &radeonsi_file_list
       - src/gallium/drivers/radeonsi/**/*
+      - src/gallium/include/winsys/**/*
       - src/gallium/winsys/amdgpu/**/*
       - src/amd/*
       - src/amd/addrlib/**/*
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index cf788c70f1a..5736ca22979 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -177,7 +177,7 @@ DRM_DRIVER_DESCRIPTOR_STUB(kmsro)
 #endif
 
 #ifdef GALLIUM_R300
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r300/r300_public.h"
 
@@ -196,7 +196,7 @@ DRM_DRIVER_DESCRIPTOR_STUB(r300)
 #endif
 
 #ifdef GALLIUM_R600
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r600/r600_public.h"
 
diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c
index 8e3f52476a7..964fc910147 100644
--- a/src/gallium/drivers/r300/r300_chipset.c
+++ b/src/gallium/drivers/r300/r300_chipset.c
@@ -22,7 +22,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "r300_chipset.h"
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 
 #include "util/u_debug.h"
 #include "util/u_memory.h"
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 3b68efdcf34..fe987fd3c37 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -25,7 +25,7 @@
 #define R300_SCREEN_H
 
 #include "r300_chipset.h"
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "pipe/p_screen.h"
 #include "util/disk_cache.h"
 #include "util/slab.h"
diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h
index bbfd5484041..341511d5574 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.h
+++ b/src/gallium/drivers/r600/r600_pipe_common.h
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 
 #include "util/disk_cache.h"
 #include "util/u_blitter.h"
diff --git a/src/gallium/drivers/r600/radeon_uvd.h b/src/gallium/drivers/r600/radeon_uvd.h
index 14de5fed458..ac4dd1555d0 100644
--- a/src/gallium/drivers/r600/radeon_uvd.h
+++ b/src/gallium/drivers/r600/radeon_uvd.h
@@ -34,7 +34,7 @@
 #ifndef RADEON_UVD_H
 #define RADEON_UVD_H
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 /* UVD uses PM4 packet type 0 and 2 */
diff --git a/src/gallium/drivers/r600/radeon_video.h b/src/gallium/drivers/r600/radeon_video.h
index 3f2d33528e1..5345cfb2838 100644
--- a/src/gallium/drivers/r600/radeon_video.h
+++ b/src/gallium/drivers/r600/radeon_video.h
@@ -34,7 +34,7 @@
 #ifndef RADEON_VIDEO_H
 #define RADEON_VIDEO_H
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...) \
diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 774bd6356fa..e4974368ac4 100644
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -96,7 +96,6 @@ files_libradeonsi = files(
   'radeon_vcn_enc_3_0.c',
   'radeon_video.c',
   'radeon_video.h',
-  'radeon_winsys.h',
 )
 
 radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
diff --git a/src/gallium/drivers/radeonsi/radeon_uvd.h b/src/gallium/drivers/radeonsi/radeon_uvd.h
index 15d0312c86a..16406907b6e 100644
--- a/src/gallium/drivers/radeonsi/radeon_uvd.h
+++ b/src/gallium/drivers/radeonsi/radeon_uvd.h
@@ -28,7 +28,7 @@
 #ifndef RADEON_UVD_H
 #define RADEON_UVD_H
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #include "ac_uvd_dec.h"
diff --git a/src/gallium/drivers/radeonsi/radeon_video.h b/src/gallium/drivers/radeonsi/radeon_video.h
index c1d6604e479..3f39f1eff39 100644
--- a/src/gallium/drivers/radeonsi/radeon_video.h
+++ b/src/gallium/drivers/radeonsi/radeon_video.h
@@ -28,7 +28,7 @@
 #ifndef RADEON_VIDEO_H
 #define RADEON_VIDEO_H
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...)                                                                     \
diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h
index 7b5574c12c5..1b657e75d89 100644
--- a/src/gallium/drivers/radeonsi/si_pm4.h
+++ b/src/gallium/drivers/radeonsi/si_pm4.h
@@ -25,7 +25,7 @@
 #ifndef SI_PM4_H
 #define SI_PM4_H
 
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/gallium/drivers/radeonsi/radeon_winsys.h b/src/gallium/include/winsys/radeon_winsys.h
similarity index 100%
rename from src/gallium/drivers/radeonsi/radeon_winsys.h
rename to src/gallium/include/winsys/radeon_winsys.h
diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c
index eeca74d6e87..5df2126a7a2 100644
--- a/src/gallium/targets/pipe-loader/pipe_r300.c
+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
@@ -2,5 +2,5 @@
 #include "target-helpers/inline_debug_helper.h"
 #include "frontend/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "r300/r300_public.h"
diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c
index 381bcf30046..bc536af596b 100644
--- a/src/gallium/targets/pipe-loader/pipe_r600.c
+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
@@ -2,5 +2,5 @@
 #include "target-helpers/drm_helper.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "r600/r600_public.h"
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
index de08a68f164..4651d95a1bd 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.h
@@ -30,7 +30,7 @@
 
 #include "pipebuffer/pb_cache.h"
 #include "pipebuffer/pb_slab.h"
-#include "gallium/drivers/radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "util/simple_mtx.h"
 #include "util/u_queue.h"
 #include <amdgpu.h>
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
index c1d140813bc..bb32f664c8b 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.h
@@ -27,7 +27,7 @@
 #ifndef RADEON_DRM_WINSYS_H
 #define RADEON_DRM_WINSYS_H
 
-#include "gallium/drivers/radeonsi/radeon_winsys.h"
+#include "winsys/radeon_winsys.h"
 #include "pipebuffer/pb_cache.h"
 #include "pipebuffer/pb_slab.h"
 #include "util/u_queue.h"

More information about the mesa-commit mailing list