summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-10 12:43:51 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-12 11:08:56 +0200
commit1c96e84ee486d5dbf4a3850441f3c1f95b1343e4 (patch)
treed9abc869a50c9850091f4032582d26b71abd702f /include/drm
parent4f03b1fc1eb286b73d453c03cdb45a3827726a44 (diff)
downloadop-kernel-dev-1c96e84ee486d5dbf4a3850441f3c1f95b1343e4.zip
op-kernel-dev-1c96e84ee486d5dbf4a3850441f3c1f95b1343e4.tar.gz
drm: Move __drm_pci_free to drm_legacy.h
Also sprinkle the customary legacy_ prefix. Unfortunately we can't move the other functions since i915 is still using them. Shame on me for that one :( v2: Fix patch subject as spotted by David Herrmann. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h1
-rw-r--r--include/drm/drm_legacy.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index fe6db4c..90b379c 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1303,7 +1303,6 @@ extern int drm_vma_info(struct seq_file *m, void *data);
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align);
-extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
extern int drm_pci_set_unique(struct drm_device *dev,
struct drm_master *master,
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
index 605d660..9862631 100644
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
@@ -55,4 +55,7 @@ int drm_legacy_addbufs_pci(struct drm_device *d, struct drm_buf_desc *req);
void drm_legacy_idlelock_take(struct drm_lock_data *lock);
void drm_legacy_idlelock_release(struct drm_lock_data *lock);
+/* drm_pci.c dma alloc wrappers */
+void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
+
#endif /* __DRM_DRM_LEGACY_H__ */
OpenPOWER on IntegriCloud