gallium: move drivers/radeon/* into drivers/radeonsi/

this is only used by 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

@@ -469,7 +469,6 @@
       when: on_success
     - changes: &radeon_vcn_file_list
       - src/gallium/frontends/va/**/*
-      - src/gallium/drivers/radeon/**/*
       when: on_success
     - when: never
 

src/gallium/auxiliary/target-helpers/drm_helper.h

@@ -177,7 +177,7 @@ DRM_DRIVER_DESCRIPTOR_STUB(kmsro)
 #endif
 
 #ifdef GALLIUM_R300
-#include "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...) \

src/gallium/drivers/radeon/.dir-locals.el

@@ -1,11 +0,0 @@
-((prog-mode
-  (indent-tabs-mode . t)
-  (tab-width . 8)
-  (c-basic-offset . 8)
-  (c-file-style . "stroustrup")
-  (fill-column . 78)
-  (eval . (progn
-	    (c-set-offset 'innamespace '0)
-	    (c-set-offset 'inline-open '0)))
-  )
- )

src/gallium/drivers/radeonsi/meson.build

@@ -72,28 +72,31 @@ files_libradeonsi = files(
   'si_test_dma_perf.c',
   'si_texture.c',
   'si_uvd.c',
-  '../radeon/radeon_uvd.c',
-  '../radeon/radeon_uvd.h',
-  '../radeon/radeon_vcn_enc_1_2.c',
-  '../radeon/radeon_vcn_enc_2_0.c',
-  '../radeon/radeon_vcn_enc_3_0.c',
-  '../radeon/radeon_vcn_enc.c',
-  '../radeon/radeon_vcn_enc.h',
-  '../radeon/radeon_vcn_dec_jpeg.c',
-  '../radeon/radeon_vcn_dec.c',
-  '../radeon/radeon_vcn_dec.h',
-  '../radeon/radeon_vcn_av1_default.h',
-  '../radeon/radeon_uvd_enc_1_1.c',
-  '../radeon/radeon_uvd_enc.c',
-  '../radeon/radeon_uvd_enc.h',
-  '../radeon/radeon_vce_40_2_2.c',
-  '../radeon/radeon_vce_50.c',
-  '../radeon/radeon_vce_52.c',
-  '../radeon/radeon_vce.c',
-  '../radeon/radeon_vce.h',
-  '../radeon/radeon_video.c',
-  '../radeon/radeon_video.h',
-  '../radeon/radeon_winsys.h',
+  'pspdecryptionparam.h',
+  'radeon_efc.h',
+  'radeon_temporal.h',
+  'radeon_uvd.c',
+  'radeon_uvd.h',
+  'radeon_uvd_enc.c',
+  'radeon_uvd_enc.h',
+  'radeon_uvd_enc_1_1.c',
+  'radeon_vce.c',
+  'radeon_vce.h',
+  'radeon_vce_40_2_2.c',
+  'radeon_vce_50.c',
+  'radeon_vce_52.c',
+  'radeon_vcn_av1_default.h',
+  'radeon_vcn_dec.c',
+  'radeon_vcn_dec.h',
+  'radeon_vcn_dec_jpeg.c',
+  'radeon_vcn_enc.c',
+  'radeon_vcn_enc.h',
+  'radeon_vcn_enc_1_2.c',
+  'radeon_vcn_enc_2_0.c',
+  '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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...)                                                                     \

src/gallium/drivers/radeonsi/si_get.c

@@ -23,9 +23,9 @@
  */
 
 #include "compiler/nir/nir.h"
-#include "radeon/radeon_uvd_enc.h"
-#include "radeon/radeon_vce.h"
-#include "radeon/radeon_video.h"
+#include "radeon_uvd_enc.h"
+#include "radeon_vce.h"
+#include "radeon_video.h"
 #include "si_pipe.h"
 #include "util/u_cpu_detect.h"
 #include "util/u_screen.h"

src/gallium/drivers/radeonsi/si_pipe.c

@@ -28,7 +28,7 @@
 #include "driver_ddebug/dd_util.h"
 #include "gallium/winsys/amdgpu/drm/amdgpu_public.h"
 #include "gallium/winsys/radeon/drm/radeon_drm_public.h"
-#include "radeon/radeon_uvd.h"
+#include "radeon_uvd.h"
 #include "si_compute.h"
 #include "si_public.h"
 #include "si_shader_internal.h"

src/gallium/drivers/radeonsi/si_pm4.h

@@ -25,7 +25,7 @@
 #ifndef SI_PM4_H
 #define SI_PM4_H
 
-#include "radeon/radeon_winsys.h"
+#include "radeonsi/radeon_winsys.h"
 
 #ifdef __cplusplus
 extern "C" {

src/gallium/drivers/radeonsi/si_uvd.c

@@ -26,12 +26,12 @@
  **************************************************************************/
 
 #include "drm-uapi/drm_fourcc.h"
-#include "radeon/radeon_uvd.h"
-#include "radeon/radeon_uvd_enc.h"
-#include "radeon/radeon_vce.h"
-#include "radeon/radeon_vcn_dec.h"
-#include "radeon/radeon_vcn_enc.h"
-#include "radeon/radeon_video.h"
+#include "radeon_uvd.h"
+#include "radeon_uvd_enc.h"
+#include "radeon_vce.h"
+#include "radeon_vcn_dec.h"
+#include "radeon_vcn_enc.h"
+#include "radeon_video.h"
 #include "si_pipe.h"
 #include "util/u_video.h"
 

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 "radeon/radeon_winsys.h"
+#include "radeonsi/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 "radeon/radeon_winsys.h"
+#include "radeonsi/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/radeon/radeon_winsys.h"
+#include "gallium/drivers/radeonsi/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/radeon/radeon_winsys.h"
+#include "gallium/drivers/radeonsi/radeon_winsys.h"
 #include "pipebuffer/pb_cache.h"
 #include "pipebuffer/pb_slab.h"
 #include "util/u_queue.h"