diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 06:12:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 03:11:21 -0400 |
commit | 9f50bd8905ab12e3e8ebffd8296d7921bd3976eb (patch) | |
tree | 0112a1a525d4cd14d2ec9b47a4b42b126194bf16 | |
parent | 58b21c22c66dd223d27405d54b47102a27bda0b7 (diff) |
drm/radeon: move drm_buffer to drm/radeon/
Radeon UMS is the last user of drm_buffer. Move it out of sight so radeon
can drop it together with UMS.
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/Makefile | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/drm_buffer.c (renamed from drivers/gpu/drm/drm_buffer.c) | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/drm_buffer.h (renamed from include/drm/drm_buffer.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 4a55d59ccd22..9b7cb3f76f01 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | ccflags-y := -Iinclude/drm | 5 | ccflags-y := -Iinclude/drm |
6 | 6 | ||
7 | drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ | 7 | drm-y := drm_auth.o drm_bufs.o drm_cache.o \ |
8 | drm_context.o drm_dma.o \ | 8 | drm_context.o drm_dma.o \ |
9 | drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ | 9 | drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ |
10 | drm_lock.o drm_memory.o drm_drv.o drm_vm.o \ | 10 | drm_lock.o drm_memory.o drm_drv.o drm_vm.o \ |
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 357f09afd222..7d7aed5357f0 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile | |||
@@ -60,7 +60,7 @@ radeon-y := radeon_drv.o | |||
60 | 60 | ||
61 | # add UMS driver | 61 | # add UMS driver |
62 | radeon-$(CONFIG_DRM_RADEON_UMS)+= radeon_cp.o radeon_state.o radeon_mem.o \ | 62 | radeon-$(CONFIG_DRM_RADEON_UMS)+= radeon_cp.o radeon_state.o radeon_mem.o \ |
63 | radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o | 63 | radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o drm_buffer.o |
64 | 64 | ||
65 | # add KMS driver | 65 | # add KMS driver |
66 | radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ | 66 | radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ |
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/radeon/drm_buffer.c index 86a4a4a60afc..f4e0f3a3d7b1 100644 --- a/drivers/gpu/drm/drm_buffer.c +++ b/drivers/gpu/drm/radeon/drm_buffer.c | |||
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/export.h> | 35 | #include <linux/export.h> |
36 | #include <drm/drm_buffer.h> | 36 | #include "drm_buffer.h" |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Allocate the drm buffer object. | 39 | * Allocate the drm buffer object. |
@@ -86,7 +86,6 @@ error_out: | |||
86 | kfree(*buf); | 86 | kfree(*buf); |
87 | return -ENOMEM; | 87 | return -ENOMEM; |
88 | } | 88 | } |
89 | EXPORT_SYMBOL(drm_buffer_alloc); | ||
90 | 89 | ||
91 | /** | 90 | /** |
92 | * Copy the user data to the begin of the buffer and reset the processing | 91 | * Copy the user data to the begin of the buffer and reset the processing |
@@ -123,7 +122,6 @@ int drm_buffer_copy_from_user(struct drm_buffer *buf, | |||
123 | buf->iterator = 0; | 122 | buf->iterator = 0; |
124 | return 0; | 123 | return 0; |
125 | } | 124 | } |
126 | EXPORT_SYMBOL(drm_buffer_copy_from_user); | ||
127 | 125 | ||
128 | /** | 126 | /** |
129 | * Free the drm buffer object | 127 | * Free the drm buffer object |
@@ -141,7 +139,6 @@ void drm_buffer_free(struct drm_buffer *buf) | |||
141 | kfree(buf); | 139 | kfree(buf); |
142 | } | 140 | } |
143 | } | 141 | } |
144 | EXPORT_SYMBOL(drm_buffer_free); | ||
145 | 142 | ||
146 | /** | 143 | /** |
147 | * Read an object from buffer that may be split to multiple parts. If object | 144 | * Read an object from buffer that may be split to multiple parts. If object |
@@ -178,4 +175,3 @@ void *drm_buffer_read_object(struct drm_buffer *buf, | |||
178 | drm_buffer_advance(buf, objsize); | 175 | drm_buffer_advance(buf, objsize); |
179 | return obj; | 176 | return obj; |
180 | } | 177 | } |
181 | EXPORT_SYMBOL(drm_buffer_read_object); | ||
diff --git a/include/drm/drm_buffer.h b/drivers/gpu/drm/radeon/drm_buffer.h index c80d3a340b94..c80d3a340b94 100644 --- a/include/drm/drm_buffer.h +++ b/drivers/gpu/drm/radeon/drm_buffer.h | |||
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 84b1d5367a11..9418e388b045 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c | |||
@@ -34,10 +34,10 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <drm/drmP.h> | 36 | #include <drm/drmP.h> |
37 | #include <drm/drm_buffer.h> | ||
38 | #include <drm/radeon_drm.h> | 37 | #include <drm/radeon_drm.h> |
39 | #include "radeon_drv.h" | 38 | #include "radeon_drv.h" |
40 | #include "r300_reg.h" | 39 | #include "r300_reg.h" |
40 | #include "drm_buffer.h" | ||
41 | 41 | ||
42 | #include <asm/unaligned.h> | 42 | #include <asm/unaligned.h> |
43 | 43 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 23bb64fd775f..535403e0c8a2 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -30,9 +30,9 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <drm/drmP.h> | 32 | #include <drm/drmP.h> |
33 | #include <drm/drm_buffer.h> | ||
34 | #include <drm/radeon_drm.h> | 33 | #include <drm/radeon_drm.h> |
35 | #include "radeon_drv.h" | 34 | #include "radeon_drv.h" |
35 | #include "drm_buffer.h" | ||
36 | 36 | ||
37 | /* ================================================================ | 37 | /* ================================================================ |
38 | * Helper functions for client state checking and fixup | 38 | * Helper functions for client state checking and fixup |