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@amd.com>
Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15907>

.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/**/*

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"
 

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"

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"

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"

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 */

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...) \

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,

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"

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...)                                                                     \

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" {

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"

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"

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>

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"