diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-10 06:43:53 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-12 05:16:29 -0400 |
commit | 67d0ec4e885cd2af861a14bb9bd59fd23e9644ae (patch) | |
tree | 46284ebef8d0d7626984e564b0b79ddefddb9f8a /include/drm | |
parent | 18882995713d2ebdd24d6b07f1853a866a7e1b66 (diff) |
drm: Move piles of functions from drmP.h to drm_internal.h
This way drivers can't grow crazy ideas any more, and it also
helps a bit in reviewing EXPORT_SYMBOLS.
v2: Even more stuff. Unfortunately we can't move drm_vm_open_locked
because exynos does some horrible stuff with it.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 90ae120b2c29..52198870bba7 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -1084,7 +1084,6 @@ extern long drm_ioctl(struct file *filp, | |||
1084 | unsigned int cmd, unsigned long arg); | 1084 | unsigned int cmd, unsigned long arg); |
1085 | extern long drm_compat_ioctl(struct file *filp, | 1085 | extern long drm_compat_ioctl(struct file *filp, |
1086 | unsigned int cmd, unsigned long arg); | 1086 | unsigned int cmd, unsigned long arg); |
1087 | extern int drm_lastclose(struct drm_device *dev); | ||
1088 | extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags); | 1087 | extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags); |
1089 | 1088 | ||
1090 | /* Device support (drm_fops.h) */ | 1089 | /* Device support (drm_fops.h) */ |
@@ -1096,14 +1095,10 @@ extern int drm_release(struct inode *inode, struct file *filp); | |||
1096 | 1095 | ||
1097 | /* Mapping support (drm_vm.h) */ | 1096 | /* Mapping support (drm_vm.h) */ |
1098 | extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); | 1097 | extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); |
1099 | extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); | ||
1100 | extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma); | 1098 | extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma); |
1101 | extern void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); | ||
1102 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); | 1099 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); |
1103 | 1100 | ||
1104 | /* Misc. IOCTL support (drm_ioctl.h) */ | 1101 | /* Misc. IOCTL support (drm_ioctl.h) */ |
1105 | extern int drm_irq_by_busid(struct drm_device *dev, void *data, | ||
1106 | struct drm_file *file_priv); | ||
1107 | extern int drm_getunique(struct drm_device *dev, void *data, | 1102 | extern int drm_getunique(struct drm_device *dev, void *data, |
1108 | struct drm_file *file_priv); | 1103 | struct drm_file *file_priv); |
1109 | extern int drm_setunique(struct drm_device *dev, void *data, | 1104 | extern int drm_setunique(struct drm_device *dev, void *data, |
@@ -1123,13 +1118,6 @@ extern int drm_setversion(struct drm_device *dev, void *data, | |||
1123 | extern int drm_noop(struct drm_device *dev, void *data, | 1118 | extern int drm_noop(struct drm_device *dev, void *data, |
1124 | struct drm_file *file_priv); | 1119 | struct drm_file *file_priv); |
1125 | 1120 | ||
1126 | /* Authentication IOCTL support (drm_auth.h) */ | ||
1127 | extern int drm_getmagic(struct drm_device *dev, void *data, | ||
1128 | struct drm_file *file_priv); | ||
1129 | extern int drm_authmagic(struct drm_device *dev, void *data, | ||
1130 | struct drm_file *file_priv); | ||
1131 | extern int drm_remove_magic(struct drm_master *master, drm_magic_t magic); | ||
1132 | |||
1133 | /* Cache management (drm_cache.c) */ | 1121 | /* Cache management (drm_cache.c) */ |
1134 | void drm_clflush_pages(struct page *pages[], unsigned long num_pages); | 1122 | void drm_clflush_pages(struct page *pages[], unsigned long num_pages); |
1135 | void drm_clflush_sg(struct sg_table *st); | 1123 | void drm_clflush_sg(struct sg_table *st); |
@@ -1141,8 +1129,6 @@ void drm_clflush_virt_range(void *addr, unsigned long length); | |||
1141 | */ | 1129 | */ |
1142 | 1130 | ||
1143 | /* IRQ support (drm_irq.h) */ | 1131 | /* IRQ support (drm_irq.h) */ |
1144 | extern int drm_control(struct drm_device *dev, void *data, | ||
1145 | struct drm_file *file_priv); | ||
1146 | extern int drm_irq_install(struct drm_device *dev, int irq); | 1132 | extern int drm_irq_install(struct drm_device *dev, int irq); |
1147 | extern int drm_irq_uninstall(struct drm_device *dev); | 1133 | extern int drm_irq_uninstall(struct drm_device *dev); |
1148 | 1134 | ||
@@ -1256,15 +1242,6 @@ static inline void drm_debugfs_connector_remove(struct drm_connector *connector) | |||
1256 | 1242 | ||
1257 | #endif | 1243 | #endif |
1258 | 1244 | ||
1259 | /* Info file support */ | ||
1260 | extern int drm_name_info(struct seq_file *m, void *data); | ||
1261 | extern int drm_vm_info(struct seq_file *m, void *data); | ||
1262 | extern int drm_bufs_info(struct seq_file *m, void *data); | ||
1263 | extern int drm_vblank_info(struct seq_file *m, void *data); | ||
1264 | extern int drm_clients_info(struct seq_file *m, void* data); | ||
1265 | extern int drm_gem_name_info(struct seq_file *m, void *data); | ||
1266 | |||
1267 | |||
1268 | extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev, | 1245 | extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev, |
1269 | struct drm_gem_object *obj, int flags); | 1246 | struct drm_gem_object *obj, int flags); |
1270 | extern int drm_gem_prime_handle_to_fd(struct drm_device *dev, | 1247 | extern int drm_gem_prime_handle_to_fd(struct drm_device *dev, |
@@ -1276,11 +1253,6 @@ extern int drm_gem_prime_fd_to_handle(struct drm_device *dev, | |||
1276 | struct drm_file *file_priv, int prime_fd, uint32_t *handle); | 1253 | struct drm_file *file_priv, int prime_fd, uint32_t *handle); |
1277 | extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf); | 1254 | extern void drm_gem_dmabuf_release(struct dma_buf *dma_buf); |
1278 | 1255 | ||
1279 | extern int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, | ||
1280 | struct drm_file *file_priv); | ||
1281 | extern int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, | ||
1282 | struct drm_file *file_priv); | ||
1283 | |||
1284 | extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, | 1256 | extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages, |
1285 | dma_addr_t *addrs, int max_pages); | 1257 | dma_addr_t *addrs, int max_pages); |
1286 | extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages); | 1258 | extern struct sg_table *drm_prime_pages_to_sg(struct page **pages, int nr_pages); |
@@ -1290,31 +1262,15 @@ int drm_gem_dumb_destroy(struct drm_file *file, | |||
1290 | struct drm_device *dev, | 1262 | struct drm_device *dev, |
1291 | uint32_t handle); | 1263 | uint32_t handle); |
1292 | 1264 | ||
1293 | void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv); | ||
1294 | void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); | ||
1295 | void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf); | ||
1296 | |||
1297 | extern int drm_vma_info(struct seq_file *m, void *data); | ||
1298 | |||
1299 | 1265 | ||
1300 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, | 1266 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, |
1301 | size_t align); | 1267 | size_t align); |
1302 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); | 1268 | extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); |
1303 | extern int drm_pci_set_unique(struct drm_device *dev, | ||
1304 | struct drm_master *master, | ||
1305 | struct drm_unique *u); | ||
1306 | 1269 | ||
1307 | /* sysfs support (drm_sysfs.c) */ | 1270 | /* sysfs support (drm_sysfs.c) */ |
1308 | extern struct class *drm_sysfs_create(struct module *owner, char *name); | ||
1309 | extern void drm_sysfs_destroy(void); | ||
1310 | extern struct device *drm_sysfs_minor_alloc(struct drm_minor *minor); | ||
1311 | extern void drm_sysfs_hotplug_event(struct drm_device *dev); | 1271 | extern void drm_sysfs_hotplug_event(struct drm_device *dev); |
1312 | extern int drm_sysfs_connector_add(struct drm_connector *connector); | ||
1313 | extern void drm_sysfs_connector_remove(struct drm_connector *connector); | ||
1314 | 1272 | ||
1315 | /* Graphics Execution Manager library functions (drm_gem.c) */ | 1273 | /* Graphics Execution Manager library functions (drm_gem.c) */ |
1316 | int drm_gem_init(struct drm_device *dev); | ||
1317 | void drm_gem_destroy(struct drm_device *dev); | ||
1318 | void drm_gem_object_release(struct drm_gem_object *obj); | 1274 | void drm_gem_object_release(struct drm_gem_object *obj); |
1319 | void drm_gem_object_free(struct kref *kref); | 1275 | void drm_gem_object_free(struct kref *kref); |
1320 | int drm_gem_object_init(struct drm_device *dev, | 1276 | int drm_gem_object_init(struct drm_device *dev, |
@@ -1353,9 +1309,6 @@ drm_gem_object_unreference_unlocked(struct drm_gem_object *obj) | |||
1353 | } | 1309 | } |
1354 | } | 1310 | } |
1355 | 1311 | ||
1356 | int drm_gem_handle_create_tail(struct drm_file *file_priv, | ||
1357 | struct drm_gem_object *obj, | ||
1358 | u32 *handlep); | ||
1359 | int drm_gem_handle_create(struct drm_file *file_priv, | 1312 | int drm_gem_handle_create(struct drm_file *file_priv, |
1360 | struct drm_gem_object *obj, | 1313 | struct drm_gem_object *obj, |
1361 | u32 *handlep); | 1314 | u32 *handlep); |
@@ -1373,14 +1326,6 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages, | |||
1373 | struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev, | 1326 | struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev, |
1374 | struct drm_file *filp, | 1327 | struct drm_file *filp, |
1375 | u32 handle); | 1328 | u32 handle); |
1376 | int drm_gem_close_ioctl(struct drm_device *dev, void *data, | ||
1377 | struct drm_file *file_priv); | ||
1378 | int drm_gem_flink_ioctl(struct drm_device *dev, void *data, | ||
1379 | struct drm_file *file_priv); | ||
1380 | int drm_gem_open_ioctl(struct drm_device *dev, void *data, | ||
1381 | struct drm_file *file_priv); | ||
1382 | void drm_gem_open(struct drm_device *dev, struct drm_file *file_private); | ||
1383 | void drm_gem_release(struct drm_device *dev, struct drm_file *file_private); | ||
1384 | 1329 | ||
1385 | extern void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev); | 1330 | extern void drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev); |
1386 | extern void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); | 1331 | extern void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev); |