diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-10 06:43:51 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-12 05:08:56 -0400 |
commit | 1c96e84ee486d5dbf4a3850441f3c1f95b1343e4 (patch) | |
tree | d9abc869a50c9850091f4032582d26b71abd702f /include/drm | |
parent | 4f03b1fc1eb286b73d453c03cdb45a3827726a44 (diff) |
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.h | 1 | ||||
-rw-r--r-- | include/drm/drm_legacy.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index fe6db4cc0db2..90b379cd07ad 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); | |||
1303 | 1303 | ||
1304 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, | 1304 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, |
1305 | size_t align); | 1305 | size_t align); |
1306 | extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | ||
1307 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | 1306 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); |
1308 | extern int drm_pci_set_unique(struct drm_device *dev, | 1307 | extern int drm_pci_set_unique(struct drm_device *dev, |
1309 | struct drm_master *master, | 1308 | struct drm_master *master, |
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 605d66081e3f..98626317e48b 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); | |||
55 | void drm_legacy_idlelock_take(struct drm_lock_data *lock); | 55 | void drm_legacy_idlelock_take(struct drm_lock_data *lock); |
56 | void drm_legacy_idlelock_release(struct drm_lock_data *lock); | 56 | void drm_legacy_idlelock_release(struct drm_lock_data *lock); |
57 | 57 | ||
58 | /* drm_pci.c dma alloc wrappers */ | ||
59 | void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | ||
60 | |||
58 | #endif /* __DRM_DRM_LEGACY_H__ */ | 61 | #endif /* __DRM_DRM_LEGACY_H__ */ |