diff options
Diffstat (limited to 'src/gallium/drivers')
32 files changed, 35 insertions, 36 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c index 9a7ebf3064e..418effa92d7 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_resource.c +++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c @@ -36,7 +36,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #ifndef DRM_FORMAT_MOD_INVALID #define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1) diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 35dcac1409b..de822fc85ca 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -46,7 +46,7 @@ #include "state_tracker/drm_driver.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #define ETNA_DRM_VERSION(major, minor) ((major) << 16 | (minor)) #define ETNA_DRM_VERSION_FENCE_FD ETNA_DRM_VERSION(1, 1) diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture.c b/src/gallium/drivers/etnaviv/etnaviv_texture.c index b06f20531fd..c4d53324054 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture.c +++ b/src/gallium/drivers/etnaviv/etnaviv_texture.c @@ -37,7 +37,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" static void etna_bind_sampler_states(struct pipe_context *pctx, enum pipe_shader_type shader, diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c index ef2a7bd581c..3b55313074c 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c @@ -37,7 +37,7 @@ #include "util/u_inlines.h" #include "util/u_memory.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" static void * etna_create_sampler_state_state(struct pipe_context *pipe, diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c index 0294697af28..0b7411b47ef 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c +++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c @@ -42,7 +42,7 @@ #include "hw/common_3d.xml.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" /* Compute offset into a 1D/2D/3D buffer of a certain box. * This box must be aligned to the block width and height of the diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk index e579264924f..ccd88a7d16c 100644 --- a/src/gallium/drivers/freedreno/Android.mk +++ b/src/gallium/drivers/freedreno/Android.mk @@ -39,7 +39,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/ir3 \ - $(MESA_TOP)/include/drm-uapi + $(MESA_TOP)/include LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index dbc15f40389..c002378dfb1 100644 --- a/src/gallium/drivers/freedreno/Makefile.am +++ b/src/gallium/drivers/freedreno/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -Wno-packed-bitfield-compat \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \ -I$(top_srcdir)/src/freedreno \ -I$(top_srcdir)/src/freedreno/registers \ diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c index 5f99a7ca60c..f2ad2c517c6 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.c +++ b/src/gallium/drivers/freedreno/freedreno_resource.c @@ -43,7 +43,7 @@ #include "freedreno_query_hw.h" #include "freedreno_util.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include <errno.h> /* XXX this should go away, needed for 'struct winsys_handle' */ diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index c3b08ab0e0f..c5a96a87dc0 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -39,7 +39,7 @@ #include "util/os_time.h" -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include <errno.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk index a446774a86e..cd2dd0938f4 100644 --- a/src/gallium/drivers/nouveau/Android.mk +++ b/src/gallium/drivers/nouveau/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := \ $(NVC0_C_SOURCES) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include/drm-uapi + $(MESA_TOP)/include LOCAL_SHARED_LIBRARIES := libdrm_nouveau LOCAL_MODULE := libmesa_pipe_nouveau diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am index f6126b54481..48c0fdf512d 100644 --- a/src/gallium/drivers/nouveau/Makefile.am +++ b/src/gallium/drivers/nouveau/Makefile.am @@ -24,7 +24,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ $(GALLIUM_DRIVER_CFLAGS) \ $(LIBDRM_CFLAGS) \ $(NOUVEAU_CFLAGS) diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build index 242ee0e0001..4192967f82d 100644 --- a/src/gallium/drivers/nouveau/meson.build +++ b/src/gallium/drivers/nouveau/meson.build @@ -208,7 +208,7 @@ libnouveau = static_library( 'nouveau', [files_libnouveau], include_directories : [ - inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_drm_uapi + inc_src, inc_include, inc_gallium, inc_gallium_aux, ], c_args : [c_vis_args], cpp_args : [cpp_vis_args], diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index f13988ea526..e0ed0af3eaa 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -6,7 +6,7 @@ #include "pipe/p_defines.h" -#include <drm.h> +#include "drm-uapi/drm.h" #include <nouveau.h> #ifndef NV04_PFIFO_MAX_PACKET_LEN diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c index 7983c403087..af5baa3def0 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include "pipe/p_state.h" #include "pipe/p_defines.h" diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c index ec6257a8963..d73ecf71624 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c @@ -1,4 +1,4 @@ -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include "pipe/p_context.h" #include "nvc0/nvc0_resource.h" diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build index 5e799eae119..17fdb5e1e0d 100644 --- a/src/gallium/drivers/panfrost/meson.build +++ b/src/gallium/drivers/panfrost/meson.build @@ -46,7 +46,6 @@ inc_panfrost = [ inc_common, inc_gallium, inc_gallium_aux, - inc_drm_uapi, inc_include, inc_src, include_directories('include'), diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c index 4864ffb4fd3..a38ab5e9928 100644 --- a/src/gallium/drivers/panfrost/pan_resource.c +++ b/src/gallium/drivers/panfrost/pan_resource.c @@ -29,7 +29,7 @@ #include <xf86drm.h> #include <fcntl.h> -#include <drm_fourcc.h> +#include "drm-uapi/drm_fourcc.h" #include "state_tracker/winsys_handle.h" #include "util/u_format.h" diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h index 78baffbd1b2..af92fa48ec9 100644 --- a/src/gallium/drivers/panfrost/pan_resource.h +++ b/src/gallium/drivers/panfrost/pan_resource.h @@ -29,7 +29,7 @@ #include <panfrost-job.h> #include "pan_screen.h" #include "pan_allocate.h" -#include <drm.h> +#include "drm-uapi/drm.h" struct panfrost_bo { /* Address to the BO in question */ diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 3590b608818..0995d2f3142 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -41,7 +41,7 @@ #include <fcntl.h> -#include "drm_fourcc.h" +#include "drm-uapi/drm_fourcc.h" #include "pan_screen.h" #include "pan_resource.h" diff --git a/src/gallium/drivers/tegra/Makefile.am b/src/gallium/drivers/tegra/Makefile.am index 1347d2548dc..75328ece242 100644 --- a/src/gallium/drivers/tegra/Makefile.am +++ b/src/gallium/drivers/tegra/Makefile.am @@ -2,7 +2,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ $(GALLIUM_DRIVER_CFLAGS) noinst_LTLIBRARIES = libtegra.la diff --git a/src/gallium/drivers/tegra/meson.build b/src/gallium/drivers/tegra/meson.build index 79ccd143f29..d24438edc13 100644 --- a/src/gallium/drivers/tegra/meson.build +++ b/src/gallium/drivers/tegra/meson.build @@ -31,7 +31,7 @@ libtegra = static_library( c_args : [c_vis_args], include_directories : [ inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, - inc_gallium_winsys, inc_drm_uapi + inc_gallium_winsys, ], ) diff --git a/src/gallium/drivers/tegra/tegra_screen.c b/src/gallium/drivers/tegra/tegra_screen.c index 1051c167189..6e7769075d1 100644 --- a/src/gallium/drivers/tegra/tegra_screen.c +++ b/src/gallium/drivers/tegra/tegra_screen.c @@ -28,8 +28,8 @@ #include <sys/stat.h> -#include <drm_fourcc.h> -#include <tegra_drm.h> +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/tegra_drm.h" #include <xf86drm.h> #include "loader/loader.h" diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am index 5b4ed5df2b9..5fb536275fd 100644 --- a/src/gallium/drivers/v3d/Makefile.am +++ b/src/gallium/drivers/v3d/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ -I$(top_srcdir)/src/broadcom \ -I$(top_builddir)/src/broadcom \ -I$(top_builddir)/src \ diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build index 9fd80a2e3e5..4f517ada9cd 100644 --- a/src/gallium/drivers/v3d/meson.build +++ b/src/gallium/drivers/v3d/meson.build @@ -68,7 +68,7 @@ foreach ver : v3d_versions [files_per_version, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h], include_directories : [ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, - inc_gallium_drivers, inc_drm_uapi, + inc_gallium_drivers, ], c_args : [c_vis_args, v3d_args, '-DV3D_VERSION=' + ver], cpp_args : [cpp_vis_args], @@ -82,7 +82,7 @@ libv3d = static_library( [files_libv3d, v3d_xml_pack], include_directories : [ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, - inc_gallium_drivers, inc_drm_uapi, + inc_gallium_drivers, ], c_args : [c_vis_args, v3d_args], cpp_args : [cpp_vis_args, v3d_args], diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h index f3309cc3e51..de902ece205 100644 --- a/src/gallium/drivers/v3d/v3d_context.h +++ b/src/gallium/drivers/v3d/v3d_context.h @@ -36,7 +36,7 @@ #include "util/bitset.h" #include "util/slab.h" #include "xf86drm.h" -#include "v3d_drm.h" +#include "drm-uapi/v3d_drm.h" #include "v3d_screen.h" #include "broadcom/common/v3d_limits.h" diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c index 84e86799d5e..ddecafe2ec9 100644 --- a/src/gallium/drivers/v3d/v3d_resource.c +++ b/src/gallium/drivers/v3d/v3d_resource.c @@ -32,7 +32,7 @@ #include "util/u_upload_mgr.h" #include "util/u_format_zs.h" -#include "drm_fourcc.h" +#include "drm-uapi/drm_fourcc.h" #include "v3d_screen.h" #include "v3d_context.h" #include "v3d_resource.h" diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index fc141de3ca8..45c95b649a2 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -34,7 +34,7 @@ endif LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) LOCAL_C_INCLUDES := \ - $(MESA_TOP)/include/drm-uapi + $(MESA_TOP)/include # We need libmesa_nir to get NIR's generated include directories. LOCAL_STATIC_LIBRARIES := \ diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am index 4c7dd843da5..585ff20e6cf 100644 --- a/src/gallium/drivers/vc4/Makefile.am +++ b/src/gallium/drivers/vc4/Makefile.am @@ -28,7 +28,7 @@ endif AM_CFLAGS = \ -I$(top_builddir)/src/compiler/nir \ - -I$(top_srcdir)/include/drm-uapi \ + -I$(top_srcdir)/include \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/broadcom \ -I$(top_builddir)/src/broadcom \ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build index 0d7a03cd242..617578d4593 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build @@ -106,7 +106,7 @@ libvc4 = static_library( [files_libvc4, v3d_xml_pack], include_directories : [ inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom, - inc_gallium_drivers, inc_drm_uapi, + inc_gallium_drivers, ], link_with: libvc4_neon, c_args : [c_vis_args, vc4_c_args], diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h index 1d3179c719c..e7cb831774c 100644 --- a/src/gallium/drivers/vc4/vc4_context.h +++ b/src/gallium/drivers/vc4/vc4_context.h @@ -33,7 +33,7 @@ #include "xf86drm.h" #define __user -#include "vc4_drm.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_bufmgr.h" #include "vc4_resource.h" #include "vc4_cl.h" diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index a4d1b903bce..c12187d7872 100644 --- a/src/gallium/drivers/vc4/vc4_resource.c +++ b/src/gallium/drivers/vc4/vc4_resource.c @@ -31,8 +31,8 @@ #include "util/u_transfer_helper.h" #include "util/u_upload_mgr.h" -#include "drm_fourcc.h" -#include "vc4_drm.h" +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_screen.h" #include "vc4_context.h" #include "vc4_resource.h" diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c index acb4a1feb0d..5fc8c35f8a9 100644 --- a/src/gallium/drivers/vc4/vc4_screen.c +++ b/src/gallium/drivers/vc4/vc4_screen.c @@ -37,8 +37,8 @@ #include "util/ralloc.h" #include <xf86drm.h> -#include "drm_fourcc.h" -#include "vc4_drm.h" +#include "drm-uapi/drm_fourcc.h" +#include "drm-uapi/vc4_drm.h" #include "vc4_screen.h" #include "vc4_context.h" #include "vc4_resource.h" |