winsys/radeon: move radeon_winsys.h to drivers/radeon

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

@@ -28,19 +28,19 @@
 #endif
 
 #if GALLIUM_R300
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r300/r300_public.h"
 #endif
 
 #if GALLIUM_R600
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "r600/r600_public.h"
 #endif
 
 #if GALLIUM_RADEONSI
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeonsi/si_public.h"
 #endif

src/gallium/drivers/r300/r300_chipset.c

@@ -22,7 +22,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "r300_chipset.h"
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 
 #include "util/u_debug.h"
 #include "util/u_memory.h"

src/gallium/drivers/r300/r300_context.h

@@ -36,7 +36,6 @@
 #include "r300_defines.h"
 #include "r300_screen.h"
 #include "compiler/radeon_regalloc.h"
-#include "radeon/drm/radeon_winsys.h"
 
 struct u_upload_mgr;
 struct r300_context;

src/gallium/drivers/r300/r300_screen.h

@@ -25,7 +25,7 @@
 #define R300_SCREEN_H
 
 #include "r300_chipset.h"
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "pipe/p_screen.h"
 #include "util/u_slab.h"
 #include "os/os_thread.h"

src/gallium/drivers/radeon/Makefile.sources

@@ -15,7 +15,8 @@ C_SOURCES := \
 	radeon_vce.c \
 	radeon_vce.h \
 	radeon_video.c \
-	radeon_video.h
+	radeon_video.h \
+	radeon_winsys.h
 
 LLVM_C_FILES := \
 	radeon_elf_util.c \

src/gallium/drivers/radeon/r600_pipe_common.h

@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 
 #include "util/u_blitter.h"
 #include "util/u_double_list.h"

src/gallium/drivers/radeon/radeon_uvd.c

@@ -45,7 +45,6 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_mpeg12_decoder.h"
 
-#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_uvd.h"

src/gallium/drivers/radeon/radeon_uvd.h

@@ -34,7 +34,7 @@
 #ifndef RADEON_UVD_H
 #define RADEON_UVD_H
 
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 /* UVD uses PM4 packet type 0 and 2 */

src/gallium/drivers/radeon/radeon_vce.c

@@ -40,7 +40,6 @@
 
 #include "vl/vl_video_buffer.h"
 
-#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"

src/gallium/drivers/radeon/radeon_vce_40_2_2.c

@@ -40,7 +40,6 @@
 
 #include "vl/vl_video_buffer.h"
 
-#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"

src/gallium/drivers/radeon/radeon_video.c

@@ -39,7 +39,6 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_video_buffer.h"
 
-#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"

src/gallium/drivers/radeon/radeon_video.h

@@ -34,7 +34,7 @@
 #ifndef RADEON_VIDEO_H
 #define RADEON_VIDEO_H
 
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "vl/vl_video_buffer.h"
 
 #define RVID_ERR(fmt, args...) \

src/gallium/drivers/radeonsi/si_pm4.h

@@ -27,7 +27,7 @@
 #ifndef SI_PM4_H
 #define SI_PM4_H
 
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 
 #define SI_PM4_MAX_DW		256
 #define SI_PM4_MAX_BO		32

src/gallium/targets/pipe-loader/pipe_r300.c

@@ -1,7 +1,7 @@
 #include "target-helpers/inline_debug_helper.h"
 #include "state_tracker/drm_driver.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "r300/r300_public.h"
 
 static struct pipe_screen *

src/gallium/targets/pipe-loader/pipe_r600.c

@@ -1,7 +1,7 @@
 #include "state_tracker/drm_driver.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "r600/r600_public.h"
 
 static struct pipe_screen *

src/gallium/targets/pipe-loader/pipe_radeonsi.c

@@ -1,7 +1,7 @@
 #include "state_tracker/drm_driver.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeon/drm/radeon_winsys.h"
+#include "radeon/radeon_winsys.h"
 #include "radeonsi/si_public.h"
 
 static struct pipe_screen *

src/gallium/winsys/radeon/drm/Makefile.sources

@@ -6,8 +6,7 @@ C_SOURCES := \
 	radeon_drm_cs.h \
 	radeon_drm_public.h \
 	radeon_drm_winsys.c \
-	radeon_drm_winsys.h \
-	radeon_winsys.h
+	radeon_drm_winsys.h
 
 TOOLS_HDR := \
 	radeon_ctx.h

src/gallium/winsys/radeon/drm/radeon_drm_winsys.h

@@ -30,7 +30,7 @@
 #ifndef RADEON_DRM_WINSYS_H
 #define RADEON_DRM_WINSYS_H
 
-#include "radeon_winsys.h"
+#include "gallium/drivers/radeon/radeon_winsys.h"
 #include "os/os_thread.h"
 #include <radeon_drm.h>