Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/drm_bufs.c

+1 −1
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ int drm_legacy_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) 
		dmah.vaddr = map->handle;

		dmah.busaddr = map->offset;

		dmah.size = map->size;

		__drm_pci_free(dev, &dmah);

		__drm_legacy_pci_free(dev, &dmah);

		break;

	}

	kfree(map);

drivers/gpu/drm/drm_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(drm_pci_alloc); 
 *

 * 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;

	size_t sz;
@@ -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)

{

	__drm_pci_free(dev, dmah);

	__drm_legacy_pci_free(dev, dmah);

	kfree(dmah);

}

drivers/gpu/drm/drm_vm.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) 
				dmah.vaddr = map->handle;

				dmah.busaddr = map->offset;

				dmah.size = map->size;

				__drm_pci_free(dev, &dmah);

				__drm_legacy_pci_free(dev, &dmah);

				break;

			}

			kfree(map);

include/drm/drmP.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

include/drm/drm_legacy.h

+3 −0
Original line number Diff line number Diff line
@@ -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__ */