Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

David Herrmann and committed by
Dave Airlie
9f50bd89 58b21c22

+5 -9
+1 -1
drivers/gpu/drm/Makefile
··· 4 4 5 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 8 drm_context.o drm_dma.o \ 9 9 drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ 10 10 drm_lock.o drm_memory.o drm_drv.o drm_vm.o \
+1 -5
drivers/gpu/drm/drm_buffer.c drivers/gpu/drm/radeon/drm_buffer.c
··· 33 33 */ 34 34 35 35 #include <linux/export.h> 36 - #include <drm/drm_buffer.h> 36 + #include "drm_buffer.h" 37 37 38 38 /** 39 39 * Allocate the drm buffer object. ··· 86 86 kfree(*buf); 87 87 return -ENOMEM; 88 88 } 89 - EXPORT_SYMBOL(drm_buffer_alloc); 90 89 91 90 /** 92 91 * Copy the user data to the begin of the buffer and reset the processing ··· 122 123 buf->iterator = 0; 123 124 return 0; 124 125 } 125 - EXPORT_SYMBOL(drm_buffer_copy_from_user); 126 126 127 127 /** 128 128 * Free the drm buffer object ··· 139 141 kfree(buf); 140 142 } 141 143 } 142 - EXPORT_SYMBOL(drm_buffer_free); 143 144 144 145 /** 145 146 * Read an object from buffer that may be split to multiple parts. If object ··· 175 178 drm_buffer_advance(buf, objsize); 176 179 return obj; 177 180 } 178 - EXPORT_SYMBOL(drm_buffer_read_object);
+1 -1
drivers/gpu/drm/radeon/Makefile
··· 60 60 61 61 # add UMS driver 62 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 65 # add KMS driver 66 66 radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \
+1 -1
drivers/gpu/drm/radeon/r300_cmdbuf.c
··· 34 34 */ 35 35 36 36 #include <drm/drmP.h> 37 - #include <drm/drm_buffer.h> 38 37 #include <drm/radeon_drm.h> 39 38 #include "radeon_drv.h" 40 39 #include "r300_reg.h" 40 + #include "drm_buffer.h" 41 41 42 42 #include <asm/unaligned.h> 43 43
+1 -1
drivers/gpu/drm/radeon/radeon_state.c
··· 30 30 */ 31 31 32 32 #include <drm/drmP.h> 33 - #include <drm/drm_buffer.h> 34 33 #include <drm/radeon_drm.h> 35 34 #include "radeon_drv.h" 35 + #include "drm_buffer.h" 36 36 37 37 /* ================================================================ 38 38 * Helper functions for client state checking and fixup
include/drm/drm_buffer.h drivers/gpu/drm/radeon/drm_buffer.h