Commit 1c96e84e authored by Daniel Vetter's avatar Daniel Vetter

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4f03b1fc
...@@ -473,7 +473,7 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) ...@@ -473,7 +473,7 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map)
dmah.vaddr = map->handle; dmah.vaddr = map->handle;
dmah.busaddr = map->offset; dmah.busaddr = map->offset;
dmah.size = map->size; dmah.size = map->size;
__drm_pci_free(dev, &dmah); __drm_legacy_pci_free(dev, &dmah);
break; break;
} }
kfree(map); kfree(map);
......
...@@ -81,7 +81,7 @@ EXPORT_SYMBOL(drm_pci_alloc); ...@@ -81,7 +81,7 @@ EXPORT_SYMBOL(drm_pci_alloc);
* *
* This function is for internal use in the Linux-specific DRM core code. * This function is for internal use in the Linux-specific DRM core code.
*/ */
void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
{ {
unsigned long addr; unsigned long addr;
size_t sz; size_t sz;
...@@ -105,7 +105,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) ...@@ -105,7 +105,7 @@ void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
*/ */
void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
{ {
__drm_pci_free(dev, dmah); __drm_legacy_pci_free(dev, dmah);
kfree(dmah); kfree(dmah);
} }
......
...@@ -272,7 +272,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) ...@@ -272,7 +272,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
dmah.vaddr = map->handle; dmah.vaddr = map->handle;
dmah.busaddr = map->offset; dmah.busaddr = map->offset;
dmah.size = map->size; dmah.size = map->size;
__drm_pci_free(dev, &dmah); __drm_legacy_pci_free(dev, &dmah);
break; break;
} }
kfree(map); kfree(map);
......
...@@ -1303,7 +1303,6 @@ extern int drm_vma_info(struct seq_file *m, void *data); ...@@ -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, extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align); 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 void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
extern int drm_pci_set_unique(struct drm_device *dev, extern int drm_pci_set_unique(struct drm_device *dev,
struct drm_master *master, struct drm_master *master,
......
...@@ -55,4 +55,7 @@ int drm_legacy_addbufs_pci(struct drm_device *d, struct drm_buf_desc *req); ...@@ -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_take(struct drm_lock_data *lock);
void drm_legacy_idlelock_release(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__ */ #endif /* __DRM_DRM_LEGACY_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment