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

drm: Move dma functions into drm_legacy.h

Also drop the unneeded EXPORT_SYMBOL and sprinkle drm_legacy_ prefixes
where missing.

v2: Drop the confusing _core_ and drop extern, both suggested by
David.

Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

+14 -15
+1 -1
drivers/gpu/drm/drm_bufs.c
··· 1338 1338 task_pid_nr(current)); 1339 1339 return -EINVAL; 1340 1340 } 1341 - drm_free_buffer(dev, buf); 1341 + drm_legacy_free_buffer(dev, buf); 1342 1342 } 1343 1343 1344 1344 return 0;
+4 -6
drivers/gpu/drm/drm_dma.c
··· 124 124 * 125 125 * Resets the fields of \p buf. 126 126 */ 127 - void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf) 127 + void drm_legacy_free_buffer(struct drm_device *dev, struct drm_buf * buf) 128 128 { 129 129 if (!buf) 130 130 return; ··· 142 142 * 143 143 * Frees each buffer associated with \p file_priv not already on the hardware. 144 144 */ 145 - void drm_core_reclaim_buffers(struct drm_device *dev, 146 - struct drm_file *file_priv) 145 + void drm_legacy_reclaim_buffers(struct drm_device *dev, 146 + struct drm_file *file_priv) 147 147 { 148 148 struct drm_device_dma *dma = dev->dma; 149 149 int i; ··· 154 154 if (dma->buflist[i]->file_priv == file_priv) { 155 155 switch (dma->buflist[i]->list) { 156 156 case DRM_LIST_NONE: 157 - drm_free_buffer(dev, dma->buflist[i]); 157 + drm_legacy_free_buffer(dev, dma->buflist[i]); 158 158 break; 159 159 case DRM_LIST_WAIT: 160 160 dma->buflist[i]->list = DRM_LIST_RECLAIM; ··· 166 166 } 167 167 } 168 168 } 169 - 170 - EXPORT_SYMBOL(drm_core_reclaim_buffers);
+1 -1
drivers/gpu/drm/drm_fops.c
··· 404 404 drm_master_release(dev, filp); 405 405 406 406 if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) 407 - drm_core_reclaim_buffers(dev, file_priv); 407 + drm_legacy_reclaim_buffers(dev, file_priv); 408 408 409 409 drm_events_release(file_priv); 410 410
+8
drivers/gpu/drm/drm_legacy.h
··· 92 92 int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f); 93 93 int drm_legacy_lock_free(struct drm_lock_data *lock, unsigned int ctx); 94 94 95 + /* DMA support */ 96 + int drm_legacy_dma_setup(struct drm_device *dev); 97 + void drm_legacy_dma_takedown(struct drm_device *dev); 98 + void drm_legacy_free_buffer(struct drm_device *dev, 99 + struct drm_buf * buf); 100 + void drm_legacy_reclaim_buffers(struct drm_device *dev, 101 + struct drm_file *filp); 102 + 95 103 #endif /* __DRM_LEGACY_H__ */
-7
include/drm/drmP.h
··· 1140 1140 * DMA quiscent + idle. DMA quiescent usually requires the hardware lock. 1141 1141 */ 1142 1142 1143 - /* DMA support (drm_dma.h) */ 1144 - extern int drm_legacy_dma_setup(struct drm_device *dev); 1145 - extern void drm_legacy_dma_takedown(struct drm_device *dev); 1146 - extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf); 1147 - extern void drm_core_reclaim_buffers(struct drm_device *dev, 1148 - struct drm_file *filp); 1149 - 1150 1143 /* IRQ support (drm_irq.h) */ 1151 1144 extern int drm_control(struct drm_device *dev, void *data, 1152 1145 struct drm_file *file_priv);