diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-10 12:43:56 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-12 15:28:12 +0200 |
| commit | 86c1fbd55c6abc72496a45b7cbf1940324983977 (patch) | |
| tree | 0e76e288cc6bed10cd8f6f79c44ddcc20220738f /include/drm | |
| parent | drm: Purge ioctl forward declarations from drmP.h (diff) | |
| download | linux-86c1fbd55c6abc72496a45b7cbf1940324983977.tar.xz linux-86c1fbd55c6abc72496a45b7cbf1940324983977.zip | |
drm: Move drm_memory.c map support declarations to <drm/drm_legacy.h>
And replace the drm_core_ prefix with drm_legacy_ since really, this
isn't core stuff.
Also drop drm_core_dropmap since it's unused.
v2: Fix up i810.ko fully which somehow slipped through.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 18 | ||||
| -rw-r--r-- | include/drm/drm_legacy.h | 15 |
2 files changed, 15 insertions, 18 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index ac4ca4b59fdf..4a72db4b4329 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1310,24 +1310,6 @@ struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp, u32 handle); -extern void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev); -extern void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); -extern void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev); - -static __inline__ struct drm_local_map *drm_core_findmap(struct drm_device *dev, - unsigned int token) -{ - struct drm_map_list *_entry; - list_for_each_entry(_entry, &dev->maplist, head) - if (_entry->user_token == token) - return _entry->map; - return NULL; -} - -static __inline__ void drm_core_dropmap(struct drm_local_map *map) -{ -} - struct drm_device *drm_dev_alloc(struct drm_driver *driver, struct device *parent); void drm_dev_ref(struct drm_device *dev); diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 98626317e48b..cc6e528069a8 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -58,4 +58,19 @@ 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); +/* drm_memory.c */ +void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev); +void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); +void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev); + +static __inline__ struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, + unsigned int token) +{ + struct drm_map_list *_entry; + list_for_each_entry(_entry, &dev->maplist, head) + if (_entry->user_token == token) + return _entry->map; + return NULL; +} + #endif /* __DRM_DRM_LEGACY_H__ */ |