diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-11 01:41:51 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-12 05:08:53 -0400 |
commit | a266162aef4f43307d18c88fb5ecaffd8e9303af (patch) | |
tree | 89f3a864bed6a08c7f145f201a3791d99461df51 /drivers | |
parent | edbaae5a5cab89de0e64b8c03ebd9a8d5d266550 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_dma.c | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_fops.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_legacy.h | 8 |
4 files changed, 14 insertions, 8 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 9e04d6a43fa4..70ba89f66199 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -1338,7 +1338,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void *data, | |||
1338 | task_pid_nr(current)); | 1338 | task_pid_nr(current)); |
1339 | return -EINVAL; | 1339 | return -EINVAL; |
1340 | } | 1340 | } |
1341 | drm_free_buffer(dev, buf); | 1341 | drm_legacy_free_buffer(dev, buf); |
1342 | } | 1342 | } |
1343 | 1343 | ||
1344 | return 0; | 1344 | return 0; |
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index 8a140a953754..1b1dd356a1e4 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c | |||
@@ -124,7 +124,7 @@ void drm_legacy_dma_takedown(struct drm_device *dev) | |||
124 | * | 124 | * |
125 | * Resets the fields of \p buf. | 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 | if (!buf) | 129 | if (!buf) |
130 | return; | 130 | return; |
@@ -142,8 +142,8 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf) | |||
142 | * | 142 | * |
143 | * Frees each buffer associated with \p file_priv not already on the hardware. | 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, | 145 | void drm_legacy_reclaim_buffers(struct drm_device *dev, |
146 | struct drm_file *file_priv) | 146 | struct drm_file *file_priv) |
147 | { | 147 | { |
148 | struct drm_device_dma *dma = dev->dma; | 148 | struct drm_device_dma *dma = dev->dma; |
149 | int i; | 149 | int i; |
@@ -154,7 +154,7 @@ void drm_core_reclaim_buffers(struct drm_device *dev, | |||
154 | if (dma->buflist[i]->file_priv == file_priv) { | 154 | if (dma->buflist[i]->file_priv == file_priv) { |
155 | switch (dma->buflist[i]->list) { | 155 | switch (dma->buflist[i]->list) { |
156 | case DRM_LIST_NONE: | 156 | case DRM_LIST_NONE: |
157 | drm_free_buffer(dev, dma->buflist[i]); | 157 | drm_legacy_free_buffer(dev, dma->buflist[i]); |
158 | break; | 158 | break; |
159 | case DRM_LIST_WAIT: | 159 | case DRM_LIST_WAIT: |
160 | dma->buflist[i]->list = DRM_LIST_RECLAIM; | 160 | dma->buflist[i]->list = DRM_LIST_RECLAIM; |
@@ -166,5 +166,3 @@ void drm_core_reclaim_buffers(struct drm_device *dev, | |||
166 | } | 166 | } |
167 | } | 167 | } |
168 | } | 168 | } |
169 | |||
170 | EXPORT_SYMBOL(drm_core_reclaim_buffers); | ||
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index b419990042b0..3bb6234d072a 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
@@ -404,7 +404,7 @@ int drm_release(struct inode *inode, struct file *filp) | |||
404 | drm_master_release(dev, filp); | 404 | drm_master_release(dev, filp); |
405 | 405 | ||
406 | if (drm_core_check_feature(dev, DRIVER_HAVE_DMA)) | 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 | drm_events_release(file_priv); | 409 | drm_events_release(file_priv); |
410 | 410 | ||
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index 3049af5a01b3..0e0df225dec6 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h | |||
@@ -92,4 +92,12 @@ int drm_legacy_lock(struct drm_device *d, void *v, struct drm_file *f); | |||
92 | int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f); | 92 | int drm_legacy_unlock(struct drm_device *d, void *v, struct drm_file *f); |
93 | int drm_legacy_lock_free(struct drm_lock_data *lock, unsigned int ctx); | 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 | #endif /* __DRM_LEGACY_H__ */ | 103 | #endif /* __DRM_LEGACY_H__ */ |