aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov2015-04-05 09:51:59 -0500
committerEmil Velikov2015-04-28 05:19:15 -0500
commit42465feb9759ef5a6d79d7e628510cd0a081f913 (patch)
tree723eef6fd35213dd1766df5ac6eaa2e1e7a73042
parenta814f933bf9fb25cf7b3cf82c69ba07ed2a686d0 (diff)
downloadexternal-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.tar.gz
external-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.tar.xz
external-libdrm-42465feb9759ef5a6d79d7e628510cd0a081f913.zip
drm: rename libdrm{,_macros}.h
Provide a more meaningful name, considering what it does. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-rw-r--r--Makefile.sources2
-rw-r--r--exynos/exynos_drm.c2
-rw-r--r--exynos/exynos_fimg2d.c2
-rw-r--r--freedreno/freedreno_priv.h2
-rw-r--r--intel/intel_bufmgr.c2
-rw-r--r--intel/intel_bufmgr_fake.c2
-rw-r--r--intel/intel_bufmgr_gem.c2
-rw-r--r--intel/intel_decode.c2
-rw-r--r--intel/mm.c2
-rw-r--r--intel/mm.h2
-rw-r--r--intel/test_decode.c2
-rw-r--r--libdrm_macros.h (renamed from libdrm.h)0
-rw-r--r--libkms/api.c2
-rw-r--r--libkms/dumb.c2
-rw-r--r--libkms/exynos.c2
-rw-r--r--libkms/intel.c2
-rw-r--r--libkms/internal.h2
-rw-r--r--libkms/linux.c2
-rw-r--r--libkms/nouveau.c2
-rw-r--r--libkms/radeon.c2
-rw-r--r--libkms/vmwgfx.c2
-rw-r--r--nouveau/nouveau.c2
-rw-r--r--nouveau/private.h2
-rw-r--r--omap/omap_drm.c2
-rw-r--r--radeon/radeon_bo.c2
-rw-r--r--radeon/radeon_bo_gem.c2
-rw-r--r--radeon/radeon_cs.c2
-rw-r--r--radeon/radeon_cs_gem.c2
-rw-r--r--radeon/radeon_cs_space.c2
-rw-r--r--radeon/radeon_surface.c6
-rw-r--r--tegra/private.h2
-rw-r--r--tests/modetest/buffers.c2
-rw-r--r--xf86drm.c2
33 files changed, 34 insertions, 34 deletions
diff --git a/Makefile.sources b/Makefile.sources
index f2157477..8b563292 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -7,7 +7,7 @@ LIBDRM_FILES := \
7 xf86drmSL.c \ 7 xf86drmSL.c \
8 xf86drmMode.c \ 8 xf86drmMode.c \
9 xf86atomic.h \ 9 xf86atomic.h \
10 libdrm.h \ 10 libdrm_macros.h \
11 libdrm_lists.h 11 libdrm_lists.h
12 12
13LIBDRM_H_FILES := \ 13LIBDRM_H_FILES := \
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index c5dd9489..5d07ea7b 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -38,7 +38,7 @@
38 38
39#include <xf86drm.h> 39#include <xf86drm.h>
40 40
41#include "libdrm.h" 41#include "libdrm_macros.h"
42#include "exynos_drm.h" 42#include "exynos_drm.h"
43#include "exynos_drmif.h" 43#include "exynos_drmif.h"
44 44
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index fc605edf..cb422e8a 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -24,7 +24,7 @@
24 24
25#include <xf86drm.h> 25#include <xf86drm.h>
26 26
27#include "libdrm.h" 27#include "libdrm_macros.h"
28#include "exynos_drm.h" 28#include "exynos_drm.h"
29#include "fimg2d_reg.h" 29#include "fimg2d_reg.h"
30#include "exynos_fimg2d.h" 30#include "exynos_fimg2d.h"
diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h
index 2d0fa6d0..3c194fb3 100644
--- a/freedreno/freedreno_priv.h
+++ b/freedreno/freedreno_priv.h
@@ -44,7 +44,7 @@
44#include <stdio.h> 44#include <stdio.h>
45#include <assert.h> 45#include <assert.h>
46 46
47#include "libdrm.h" 47#include "libdrm_macros.h"
48#include "xf86drm.h" 48#include "xf86drm.h"
49#include "xf86atomic.h" 49#include "xf86atomic.h"
50 50
diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
index 234cd13e..a95771d7 100644
--- a/intel/intel_bufmgr.c
+++ b/intel/intel_bufmgr.c
@@ -37,7 +37,7 @@
37#include <drm.h> 37#include <drm.h>
38#include <i915_drm.h> 38#include <i915_drm.h>
39#include <pciaccess.h> 39#include <pciaccess.h>
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "intel_bufmgr.h" 41#include "intel_bufmgr.h"
42#include "intel_bufmgr_priv.h" 42#include "intel_bufmgr_priv.h"
43#include "xf86drm.h" 43#include "xf86drm.h"
diff --git a/intel/intel_bufmgr_fake.c b/intel/intel_bufmgr_fake.c
index c4828faa..d0c2d748 100644
--- a/intel/intel_bufmgr_fake.c
+++ b/intel/intel_bufmgr_fake.c
@@ -49,7 +49,7 @@
49#include "drm.h" 49#include "drm.h"
50#include "i915_drm.h" 50#include "i915_drm.h"
51#include "mm.h" 51#include "mm.h"
52#include "libdrm.h" 52#include "libdrm_macros.h"
53#include "libdrm_lists.h" 53#include "libdrm_lists.h"
54 54
55/* Support gcc's __FUNCTION__ for people using other compilers */ 55/* Support gcc's __FUNCTION__ for people using other compilers */
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index f5d6130d..55cd4ed9 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -56,7 +56,7 @@
56#ifndef ETIME 56#ifndef ETIME
57#define ETIME ETIMEDOUT 57#define ETIME ETIMEDOUT
58#endif 58#endif
59#include "libdrm.h" 59#include "libdrm_macros.h"
60#include "libdrm_lists.h" 60#include "libdrm_lists.h"
61#include "intel_bufmgr.h" 61#include "intel_bufmgr.h"
62#include "intel_bufmgr_priv.h" 62#include "intel_bufmgr_priv.h"
diff --git a/intel/intel_decode.c b/intel/intel_decode.c
index 7d5cbe5a..87597605 100644
--- a/intel/intel_decode.c
+++ b/intel/intel_decode.c
@@ -33,7 +33,7 @@
33#include <stdarg.h> 33#include <stdarg.h>
34#include <string.h> 34#include <string.h>
35 35
36#include "libdrm.h" 36#include "libdrm_macros.h"
37#include "xf86drm.h" 37#include "xf86drm.h"
38#include "intel_chipset.h" 38#include "intel_chipset.h"
39#include "intel_bufmgr.h" 39#include "intel_bufmgr.h"
diff --git a/intel/mm.c b/intel/mm.c
index 9c676601..954e9dcb 100644
--- a/intel/mm.c
+++ b/intel/mm.c
@@ -30,7 +30,7 @@
30#include <assert.h> 30#include <assert.h>
31 31
32#include "xf86drm.h" 32#include "xf86drm.h"
33#include "libdrm.h" 33#include "libdrm_macros.h"
34#include "mm.h" 34#include "mm.h"
35 35
36drm_private void mmDumpMemInfo(const struct mem_block *heap) 36drm_private void mmDumpMemInfo(const struct mem_block *heap)
diff --git a/intel/mm.h b/intel/mm.h
index 01813a5e..8d83743f 100644
--- a/intel/mm.h
+++ b/intel/mm.h
@@ -33,7 +33,7 @@
33#include "config.h" 33#include "config.h"
34#endif 34#endif
35 35
36#include "libdrm.h" 36#include "libdrm_macros.h"
37 37
38struct mem_block { 38struct mem_block {
39 struct mem_block *next, *prev; 39 struct mem_block *next, *prev;
diff --git a/intel/test_decode.c b/intel/test_decode.c
index 93f47efc..bef86bb9 100644
--- a/intel/test_decode.c
+++ b/intel/test_decode.c
@@ -34,7 +34,7 @@
34#include <sys/stat.h> 34#include <sys/stat.h>
35#include <err.h> 35#include <err.h>
36 36
37#include "libdrm.h" 37#include "libdrm_macros.h"
38#include "intel_bufmgr.h" 38#include "intel_bufmgr.h"
39#include "intel_chipset.h" 39#include "intel_chipset.h"
40 40
diff --git a/libdrm.h b/libdrm_macros.h
index 6c3cd594..6c3cd594 100644
--- a/libdrm.h
+++ b/libdrm_macros.h
diff --git a/libkms/api.c b/libkms/api.c
index a07a242c..354d8a2e 100644
--- a/libkms/api.c
+++ b/libkms/api.c
@@ -34,7 +34,7 @@
34#include <stdlib.h> 34#include <stdlib.h>
35#include <string.h> 35#include <string.h>
36 36
37#include "libdrm.h" 37#include "libdrm_macros.h"
38#include "internal.h" 38#include "internal.h"
39 39
40int kms_create(int fd, struct kms_driver **out) 40int kms_create(int fd, struct kms_driver **out)
diff --git a/libkms/dumb.c b/libkms/dumb.c
index e252d8c1..b95a072c 100644
--- a/libkms/dumb.c
+++ b/libkms/dumb.c
@@ -38,7 +38,7 @@
38 38
39#include <sys/ioctl.h> 39#include <sys/ioctl.h>
40#include "xf86drm.h" 40#include "xf86drm.h"
41#include "libdrm.h" 41#include "libdrm_macros.h"
42 42
43struct dumb_bo 43struct dumb_bo
44{ 44{
diff --git a/libkms/exynos.c b/libkms/exynos.c
index db65f816..5de2e5a9 100644
--- a/libkms/exynos.c
+++ b/libkms/exynos.c
@@ -25,7 +25,7 @@
25#include <sys/ioctl.h> 25#include <sys/ioctl.h>
26#include "xf86drm.h" 26#include "xf86drm.h"
27 27
28#include "libdrm.h" 28#include "libdrm_macros.h"
29#include "exynos_drm.h" 29#include "exynos_drm.h"
30 30
31struct exynos_bo 31struct exynos_bo
diff --git a/libkms/intel.c b/libkms/intel.c
index a539df24..3d8ca055 100644
--- a/libkms/intel.c
+++ b/libkms/intel.c
@@ -38,7 +38,7 @@
38 38
39#include <sys/ioctl.h> 39#include <sys/ioctl.h>
40#include "xf86drm.h" 40#include "xf86drm.h"
41#include "libdrm.h" 41#include "libdrm_macros.h"
42 42
43#include "i915_drm.h" 43#include "i915_drm.h"
44 44
diff --git a/libkms/internal.h b/libkms/internal.h
index e7d5c463..905f5b17 100644
--- a/libkms/internal.h
+++ b/libkms/internal.h
@@ -33,7 +33,7 @@
33#include "config.h" 33#include "config.h"
34#endif 34#endif
35 35
36#include "libdrm.h" 36#include "libdrm_macros.h"
37#include "libkms.h" 37#include "libkms.h"
38 38
39struct kms_driver 39struct kms_driver
diff --git a/libkms/linux.c b/libkms/linux.c
index 06dbc421..4d47148a 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -41,7 +41,7 @@
41#include <unistd.h> 41#include <unistd.h>
42#include <sys/stat.h> 42#include <sys/stat.h>
43 43
44#include "libdrm.h" 44#include "libdrm_macros.h"
45#include "internal.h" 45#include "internal.h"
46 46
47#define PATH_SIZE 512 47#define PATH_SIZE 512
diff --git a/libkms/nouveau.c b/libkms/nouveau.c
index 7f57f214..d10e0fdb 100644
--- a/libkms/nouveau.c
+++ b/libkms/nouveau.c
@@ -38,7 +38,7 @@
38 38
39#include <sys/ioctl.h> 39#include <sys/ioctl.h>
40#include "xf86drm.h" 40#include "xf86drm.h"
41#include "libdrm.h" 41#include "libdrm_macros.h"
42 42
43#include "nouveau_drm.h" 43#include "nouveau_drm.h"
44 44
diff --git a/libkms/radeon.c b/libkms/radeon.c
index f0d5db62..aaeeaf31 100644
--- a/libkms/radeon.c
+++ b/libkms/radeon.c
@@ -38,7 +38,7 @@
38 38
39#include <sys/ioctl.h> 39#include <sys/ioctl.h>
40#include "xf86drm.h" 40#include "xf86drm.h"
41#include "libdrm.h" 41#include "libdrm_macros.h"
42 42
43#include "radeon_drm.h" 43#include "radeon_drm.h"
44 44
diff --git a/libkms/vmwgfx.c b/libkms/vmwgfx.c
index 3c99ea33..6a24fd4d 100644
--- a/libkms/vmwgfx.c
+++ b/libkms/vmwgfx.c
@@ -36,7 +36,7 @@
36#include "internal.h" 36#include "internal.h"
37 37
38#include "xf86drm.h" 38#include "xf86drm.h"
39#include "libdrm.h" 39#include "libdrm_macros.h"
40#include "vmwgfx_drm.h" 40#include "vmwgfx_drm.h"
41 41
42struct vmwgfx_bo 42struct vmwgfx_bo
diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c
index 5c8a0ec5..9d12091a 100644
--- a/nouveau/nouveau.c
+++ b/nouveau/nouveau.c
@@ -37,7 +37,7 @@
37 37
38#include <xf86drm.h> 38#include <xf86drm.h>
39#include <xf86atomic.h> 39#include <xf86atomic.h>
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "libdrm_lists.h" 41#include "libdrm_lists.h"
42#include "nouveau_drm.h" 42#include "nouveau_drm.h"
43 43
diff --git a/nouveau/private.h b/nouveau/private.h
index 74d604e8..e9439f30 100644
--- a/nouveau/private.h
+++ b/nouveau/private.h
@@ -1,7 +1,7 @@
1#ifndef __NOUVEAU_LIBDRM_PRIVATE_H__ 1#ifndef __NOUVEAU_LIBDRM_PRIVATE_H__
2#define __NOUVEAU_LIBDRM_PRIVATE_H__ 2#define __NOUVEAU_LIBDRM_PRIVATE_H__
3 3
4#include <libdrm.h> 4#include <libdrm_macros.h>
5#include <xf86drm.h> 5#include <xf86drm.h>
6#include <xf86atomic.h> 6#include <xf86atomic.h>
7#include <pthread.h> 7#include <pthread.h>
diff --git a/omap/omap_drm.c b/omap/omap_drm.c
index 8b4ec466..7bc89842 100644
--- a/omap/omap_drm.c
+++ b/omap/omap_drm.c
@@ -39,7 +39,7 @@
39#include <unistd.h> 39#include <unistd.h>
40#include <pthread.h> 40#include <pthread.h>
41 41
42#include <libdrm.h> 42#include <libdrm_macros.h>
43#include <xf86drm.h> 43#include <xf86drm.h>
44#include <xf86atomic.h> 44#include <xf86atomic.h>
45 45
diff --git a/radeon/radeon_bo.c b/radeon/radeon_bo.c
index 865e3f7e..02a2d83d 100644
--- a/radeon/radeon_bo.c
+++ b/radeon/radeon_bo.c
@@ -32,7 +32,7 @@
32#ifdef HAVE_CONFIG_H 32#ifdef HAVE_CONFIG_H
33#include <config.h> 33#include <config.h>
34#endif 34#endif
35#include <libdrm.h> 35#include <libdrm_macros.h>
36#include <radeon_bo.h> 36#include <radeon_bo.h>
37#include <radeon_bo_int.h> 37#include <radeon_bo_int.h>
38 38
diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index e78303a7..b48cf540 100644
--- a/radeon/radeon_bo_gem.c
+++ b/radeon/radeon_bo_gem.c
@@ -37,7 +37,7 @@
37#include <stdlib.h> 37#include <stdlib.h>
38#include <string.h> 38#include <string.h>
39#include <errno.h> 39#include <errno.h>
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "xf86drm.h" 41#include "xf86drm.h"
42#include "xf86atomic.h" 42#include "xf86atomic.h"
43#include "drm.h" 43#include "drm.h"
diff --git a/radeon/radeon_cs.c b/radeon/radeon_cs.c
index fe5bbcec..142b71f7 100644
--- a/radeon/radeon_cs.c
+++ b/radeon/radeon_cs.c
@@ -1,7 +1,7 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2#include <config.h> 2#include <config.h>
3#endif 3#endif
4#include "libdrm.h" 4#include "libdrm_macros.h"
5#include <stdio.h> 5#include <stdio.h>
6#include "radeon_cs.h" 6#include "radeon_cs.h"
7#include "radeon_cs_int.h" 7#include "radeon_cs_int.h"
diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
index 81b31846..cff2415d 100644
--- a/radeon/radeon_cs_gem.c
+++ b/radeon/radeon_cs_gem.c
@@ -44,7 +44,7 @@
44#include "radeon_cs_gem.h" 44#include "radeon_cs_gem.h"
45#include "radeon_bo_gem.h" 45#include "radeon_bo_gem.h"
46#include "drm.h" 46#include "drm.h"
47#include "libdrm.h" 47#include "libdrm_macros.h"
48#include "xf86drm.h" 48#include "xf86drm.h"
49#include "xf86atomic.h" 49#include "xf86atomic.h"
50#include "radeon_drm.h" 50#include "radeon_drm.h"
diff --git a/radeon/radeon_cs_space.c b/radeon/radeon_cs_space.c
index cca650bf..1a6ea28e 100644
--- a/radeon/radeon_cs_space.c
+++ b/radeon/radeon_cs_space.c
@@ -31,7 +31,7 @@
31#include <assert.h> 31#include <assert.h>
32#include <errno.h> 32#include <errno.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include "libdrm.h" 34#include "libdrm_macros.h"
35#include "radeon_cs.h" 35#include "radeon_cs.h"
36#include "radeon_bo_int.h" 36#include "radeon_bo_int.h"
37#include "radeon_cs_int.h" 37#include "radeon_cs_int.h"
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index bd9ee6d1..fd75b16a 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -37,7 +37,7 @@
37#include <string.h> 37#include <string.h>
38#include <sys/ioctl.h> 38#include <sys/ioctl.h>
39#include "drm.h" 39#include "drm.h"
40#include "libdrm.h" 40#include "libdrm_macros.h"
41#include "xf86drm.h" 41#include "xf86drm.h"
42#include "radeon_drm.h" 42#include "radeon_drm.h"
43#include "radeon_surface.h" 43#include "radeon_surface.h"
@@ -785,7 +785,7 @@ static int eg_surface_init_1d_miptrees(struct radeon_surface_manager *surf_man,
785{ 785{
786 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; 786 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
787 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; 787 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
788 /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ 788 /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
789 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; 789 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
790 struct radeon_surface_level *stencil_level = 790 struct radeon_surface_level *stencil_level =
791 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; 791 (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,
807{ 807{
808 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER; 808 unsigned zs_flags = RADEON_SURF_ZBUFFER | RADEON_SURF_SBUFFER;
809 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags; 809 int r, is_depth_stencil = (surf->flags & zs_flags) == zs_flags;
810 /* Old libdrm headers didn't have stencil_level in it. This prevents crashes. */ 810 /* Old libdrm_macros.headers didn't have stencil_level in it. This prevents crashes. */
811 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL]; 811 struct radeon_surface_level tmp[RADEON_SURF_MAX_LEVEL];
812 struct radeon_surface_level *stencil_level = 812 struct radeon_surface_level *stencil_level =
813 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp; 813 (surf->flags & RADEON_SURF_HAS_SBUFFER_MIPTREE) ? surf->stencil_level : tmp;
diff --git a/tegra/private.h b/tegra/private.h
index 9b6bc939..bb6c1a51 100644
--- a/tegra/private.h
+++ b/tegra/private.h
@@ -28,7 +28,7 @@
28#include <stdbool.h> 28#include <stdbool.h>
29#include <stdint.h> 29#include <stdint.h>
30 30
31#include <libdrm.h> 31#include <libdrm_macros.h>
32#include <xf86atomic.h> 32#include <xf86atomic.h>
33 33
34#include "tegra.h" 34#include "tegra.h"
diff --git a/tests/modetest/buffers.c b/tests/modetest/buffers.c
index e4e81495..878b64ea 100644
--- a/tests/modetest/buffers.c
+++ b/tests/modetest/buffers.c
@@ -39,7 +39,7 @@
39#include "drm.h" 39#include "drm.h"
40#include "drm_fourcc.h" 40#include "drm_fourcc.h"
41 41
42#include "libdrm.h" 42#include "libdrm_macros.h"
43#include "xf86drm.h" 43#include "xf86drm.h"
44 44
45#include "buffers.h" 45#include "buffers.h"
diff --git a/xf86drm.c b/xf86drm.c
index ffc53b89..f7c45f88 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -62,7 +62,7 @@
62#endif 62#endif
63 63
64#include "xf86drm.h" 64#include "xf86drm.h"
65#include "libdrm.h" 65#include "libdrm_macros.h"
66 66
67#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) 67#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
68#define DRM_MAJOR 145 68#define DRM_MAJOR 145