drm: rename libdrm{,_macros}.h

Provide a more meaningful name, considering what it does.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/Makefile.sources b/Makefile.sources
index f215747..8b56329 100644 (file)
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -7,7 +7,7 @@ LIBDRM_FILES := \
        xf86drmSL.c \
        xf86drmMode.c \
        xf86atomic.h \
-       libdrm.h \
+       libdrm_macros.h \
        libdrm_lists.h
 
 LIBDRM_H_FILES := \

diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index c5dd948..5d07ea7 100644 (file)
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -38,7 +38,7 @@
 
 #include <xf86drm.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "exynos_drm.h"
 #include "exynos_drmif.h"
 

diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index fc605ed..cb422e8 100644 (file)
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -24,7 +24,7 @@
 
 #include <xf86drm.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "exynos_drm.h"
 #include "fimg2d_reg.h"
 #include "exynos_fimg2d.h"

diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h
index 2d0fa6d..3c194fb 100644 (file)
--- a/freedreno/freedreno_priv.h
+++ b/freedreno/freedreno_priv.h
@@ -44,7 +44,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 #include "xf86atomic.h"
 

diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 234cd13..a95771d 100644 (file)
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -37,7 +37,7 @@
 #include <drm.h>
 #include <i915_drm.h>
 #include <pciaccess.h>
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"
 #include "xf86drm.h"

diff --git a/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index c4828fa..d0c2d74 100644 (file)
--- a/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
@@ -49,7 +49,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "mm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "libdrm_lists.h"
 
 /* Support gcc's __FUNCTION__ for people using other compilers */

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index f5d6130..55cd4ed 100644 (file)
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -56,7 +56,7 @@
 #ifndef ETIME
 #define ETIME ETIMEDOUT
 #endif
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "libdrm_lists.h"
 #include "intel_bufmgr.h"
 #include "intel_bufmgr_priv.h"

diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index 7d5cbe5..8759760 100644 (file)
--- a/intel/intel_decode.c
+++ b/intel/intel_decode.c
@@ -33,7 +33,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 #include "intel_chipset.h"
 #include "intel_bufmgr.h"

diff --git a/intel/mm.c b/intel/mm.c
index 9c67660..954e9dc 100644 (file)
--- a/intel/mm.c
+++ b/intel/mm.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "mm.h"
 
 drm_private void mmDumpMemInfo(const struct mem_block *heap)

diff --git a/intel/mm.h b/intel/mm.h
index 01813a5..8d83743 100644 (file)
--- a/intel/mm.h
+++ b/intel/mm.h
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 struct mem_block {
        struct mem_block *next, *prev;

diff --git a/intel/test_decode.c b/intel/test_decode.c
index 93f47ef..bef86bb 100644 (file)
--- a/intel/test_decode.c
+++ b/intel/test_decode.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <err.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "intel_bufmgr.h"
 #include "intel_chipset.h"
 

diff --git a/libdrm.h b/libdrm_macros.h
similarity index 100%
rename from libdrm.h
rename to libdrm_macros.h

diff --git a/libkms/api.c b/libkms/api.c
index a07a242..354d8a2 100644 (file)
--- a/libkms/api.c
+++ b/libkms/api.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "internal.h"
 
 int kms_create(int fd, struct kms_driver **out)

diff --git a/libkms/dumb.c b/libkms/dumb.c
index e252d8c..b95a072 100644 (file)
--- a/libkms/dumb.c
+++ b/libkms/dumb.c
@@ -38,7 +38,7 @@
 
 #include <sys/ioctl.h>
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 struct dumb_bo
 {

diff --git a/libkms/exynos.c b/libkms/exynos.c
index db65f81..5de2e5a 100644 (file)
--- a/libkms/exynos.c
+++ b/libkms/exynos.c
@@ -25,7 +25,7 @@
 #include <sys/ioctl.h>
 #include "xf86drm.h"
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "exynos_drm.h"
 
 struct exynos_bo

diff --git a/libkms/intel.c b/libkms/intel.c
index a539df2..3d8ca05 100644 (file)
--- a/libkms/intel.c
+++ b/libkms/intel.c
@@ -38,7 +38,7 @@
 
 #include <sys/ioctl.h>
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 #include "i915_drm.h"
 

diff --git a/libkms/internal.h b/libkms/internal.h
index e7d5c46..905f5b1 100644 (file)
--- a/libkms/internal.h
+++ b/libkms/internal.h
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "libkms.h"
 
 struct kms_driver

diff --git a/libkms/linux.c b/libkms/linux.c
index 06dbc42..4d47148 100644 (file)
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "internal.h"
 
 #define PATH_SIZE 512

diff --git a/libkms/nouveau.c b/libkms/nouveau.c
index 7f57f21..d10e0fd 100644 (file)
--- a/libkms/nouveau.c
+++ b/libkms/nouveau.c
@@ -38,7 +38,7 @@
 
 #include <sys/ioctl.h>
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 #include "nouveau_drm.h"
 

diff --git a/libkms/radeon.c b/libkms/radeon.c
index f0d5db6..aaeeaf3 100644 (file)
--- a/libkms/radeon.c
+++ b/libkms/radeon.c
@@ -38,7 +38,7 @@
 
 #include <sys/ioctl.h>
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 #include "radeon_drm.h"
 

diff --git a/libkms/vmwgfx.c b/libkms/vmwgfx.c
index 3c99ea3..6a24fd4 100644 (file)
--- a/libkms/vmwgfx.c
+++ b/libkms/vmwgfx.c
@@ -36,7 +36,7 @@
 #include "internal.h"
 
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "vmwgfx_drm.h"
 
 struct vmwgfx_bo

diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index 5c8a0ec..9d12091 100644 (file)
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -37,7 +37,7 @@
 
 #include <xf86drm.h>
 #include <xf86atomic.h>
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "libdrm_lists.h"
 #include "nouveau_drm.h"
 

diff --git a/nouveau/private.h b/nouveau/private.h
index 74d604e..e9439f3 100644 (file)
--- a/nouveau/private.h
+++ b/nouveau/private.h
@@ -1,7 +1,7 @@
 #ifndef __NOUVEAU_LIBDRM_PRIVATE_H__
 #define __NOUVEAU_LIBDRM_PRIVATE_H__
 
-#include <libdrm.h>
+#include <libdrm_macros.h>
 #include <xf86drm.h>
 #include <xf86atomic.h>
 #include <pthread.h>

diff --git a/omap/omap_drm.c b/omap/omap_drm.c
index 8b4ec46..7bc8984 100644 (file)
--- a/omap/omap_drm.c
+++ b/omap/omap_drm.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include <libdrm.h>
+#include <libdrm_macros.h>
 #include <xf86drm.h>
 #include <xf86atomic.h>
 

diff --git a/radeon/radeon_bo.c b/radeon/radeon_bo.c
index 865e3f7..02a2d83 100644 (file)
--- a/radeon/radeon_bo.c
+++ b/radeon/radeon_bo.c
@@ -32,7 +32,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <libdrm.h>
+#include <libdrm_macros.h>
 #include <radeon_bo.h>
 #include <radeon_bo_int.h>
 

diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index e78303a..b48cf54 100644 (file)
--- a/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 #include "xf86atomic.h"
 #include "drm.h"

diff --git a/radeon/radeon_cs.c b/radeon/radeon_cs.c
index fe5bbce..142b71f 100644 (file)
--- a/radeon/radeon_cs.c
+++ b/radeon/radeon_cs.c
@@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include <stdio.h>
 #include "radeon_cs.h"
 #include "radeon_cs_int.h"

diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 81b3184..cff2415 100644 (file)
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -44,7 +44,7 @@
 #include "radeon_cs_gem.h"
 #include "radeon_bo_gem.h"
 #include "drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 #include "xf86atomic.h"
 #include "radeon_drm.h"

diff --git a/radeon/radeon_cs_space.c b/radeon/radeon_cs_space.c
index cca650b..1a6ea28 100644 (file)
--- a/radeon/radeon_cs_space.c
+++ b/radeon/radeon_cs_space.c
@@ -31,7 +31,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "radeon_cs.h"
 #include "radeon_bo_int.h"
 #include "radeon_cs_int.h"

diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index bd9ee6d..fd75b16 100644 (file)
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include "drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 #include "radeon_drm.h"
 #include "radeon_surface.h"
@@ -785,7 +785,7 @@ static int eg_surface_init_1d_miptrees(struct radeon_surface_manager *surf_man,
 {
     unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
     int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
-    /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */
+    /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
     struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
     struct radeon_surface_level *stencil_level =
         (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;
@@ -807,7 +807,7 @@ static int eg_surface_init_2d_miptrees(struct radeon_surface_manager *surf_man,
 {
     unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
     int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
-    /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */
+    /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
     struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
     struct radeon_surface_level *stencil_level =
         (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;

diff --git a/tegra/private.h b/tegra/private.h
index 9b6bc93..bb6c1a5 100644 (file)
--- a/tegra/private.h
+++ b/tegra/private.h
@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libdrm.h>
+#include <libdrm_macros.h>
 #include <xf86atomic.h>
 
 #include "tegra.h"

diff --git a/tests/modetest/buffers.c b/tests/modetest/buffers.c
index e4e8149..878b64e 100644 (file)
--- a/tests/modetest/buffers.c
+++ b/tests/modetest/buffers.c
@@ -39,7 +39,7 @@
 #include "drm.h"
 #include "drm_fourcc.h"
 
-#include "libdrm.h"
+#include "libdrm_macros.h"
 #include "xf86drm.h"
 
 #include "buffers.h"

diff --git a/xf86drm.c b/xf86drm.c
index ffc53b8..f7c45f8 100644 (file)
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -62,7 +62,7 @@
 #endif
 
 #include "xf86drm.h"
-#include "libdrm.h"
+#include "libdrm_macros.h"
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #define DRM_MAJOR 145