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 /drivers/gpu/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 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/drm_auth.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_debugfs.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_drv.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_fops.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_internal.h | 68 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_prime.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 1 |
9 files changed, 76 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 708a2044c631..fc8e8aaa34fb 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <drm/drmP.h> | 36 | #include <drm/drmP.h> |
| 37 | #include "drm_internal.h" | ||
| 37 | 38 | ||
| 38 | struct drm_magic_entry { | 39 | struct drm_magic_entry { |
| 39 | struct list_head head; | 40 | struct list_head head; |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 7d7c1fd15443..3a1801b8fc2f 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <drm/drm_modeset_lock.h> | 40 | #include <drm/drm_modeset_lock.h> |
| 41 | 41 | ||
| 42 | #include "drm_crtc_internal.h" | 42 | #include "drm_crtc_internal.h" |
| 43 | #include "drm_internal.h" | ||
| 43 | 44 | ||
| 44 | static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, | 45 | static struct drm_framebuffer *add_framebuffer_internal(struct drm_device *dev, |
| 45 | struct drm_mode_fb_cmd2 *r, | 46 | struct drm_mode_fb_cmd2 *r, |
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 4491dbda653e..3bcf8e6a85b3 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/export.h> | 36 | #include <linux/export.h> |
| 37 | #include <drm/drmP.h> | 37 | #include <drm/drmP.h> |
| 38 | #include <drm/drm_edid.h> | 38 | #include <drm/drm_edid.h> |
| 39 | #include "drm_internal.h" | ||
| 39 | 40 | ||
| 40 | #if defined(CONFIG_DEBUG_FS) | 41 | #if defined(CONFIG_DEBUG_FS) |
| 41 | 42 | ||
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 175cbbdac8c1..fcc9d7d81a02 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <drm/drmP.h> | 35 | #include <drm/drmP.h> |
| 36 | #include <drm/drm_core.h> | 36 | #include <drm/drm_core.h> |
| 37 | #include "drm_legacy.h" | 37 | #include "drm_legacy.h" |
| 38 | #include "drm_internal.h" | ||
| 38 | 39 | ||
| 39 | unsigned int drm_debug = 0; /* 1 to enable debug output */ | 40 | unsigned int drm_debug = 0; /* 1 to enable debug output */ |
| 40 | EXPORT_SYMBOL(drm_debug); | 41 | EXPORT_SYMBOL(drm_debug); |
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 3bb6234d072a..51a77a767e66 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
| 40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 41 | #include "drm_legacy.h" | 41 | #include "drm_legacy.h" |
| 42 | #include "drm_internal.h" | ||
| 42 | 43 | ||
| 43 | /* from BKL pushdown */ | 44 | /* from BKL pushdown */ |
| 44 | DEFINE_MUTEX(drm_global_mutex); | 45 | DEFINE_MUTEX(drm_global_mutex); |
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 6adee4c2afc0..55fd65002926 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/dma-buf.h> | 38 | #include <linux/dma-buf.h> |
| 39 | #include <drm/drmP.h> | 39 | #include <drm/drmP.h> |
| 40 | #include <drm/drm_vma_manager.h> | 40 | #include <drm/drm_vma_manager.h> |
| 41 | #include "drm_internal.h" | ||
| 41 | 42 | ||
| 42 | /** @file drm_gem.c | 43 | /** @file drm_gem.c |
| 43 | * | 44 | * |
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 5fbf36bcc0b0..a71cf4b839f2 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h | |||
| @@ -21,4 +21,72 @@ | |||
| 21 | * OTHER DEALINGS IN THE SOFTWARE. | 21 | * OTHER DEALINGS IN THE SOFTWARE. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | /* drm_irq.c */ | ||
| 24 | extern unsigned int drm_timestamp_monotonic; | 25 | extern unsigned int drm_timestamp_monotonic; |
| 26 | |||
| 27 | /* drm_fops.c */ | ||
| 28 | int drm_lastclose(struct drm_device *dev); | ||
| 29 | |||
| 30 | /* drm_pci.c */ | ||
| 31 | int drm_pci_set_unique(struct drm_device *dev, | ||
| 32 | struct drm_master *master, | ||
| 33 | struct drm_unique *u); | ||
| 34 | int drm_irq_by_busid(struct drm_device *dev, void *data, | ||
| 35 | struct drm_file *file_priv); | ||
| 36 | |||
| 37 | /* drm_vm.c */ | ||
| 38 | int drm_vma_info(struct seq_file *m, void *data); | ||
| 39 | int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); | ||
| 40 | void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); | ||
| 41 | |||
| 42 | /* drm_prime.c */ | ||
| 43 | int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, | ||
| 44 | struct drm_file *file_priv); | ||
| 45 | int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, | ||
| 46 | struct drm_file *file_priv); | ||
| 47 | |||
| 48 | void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv); | ||
| 49 | void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); | ||
| 50 | void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, | ||
| 51 | struct dma_buf *dma_buf); | ||
| 52 | |||
| 53 | /* drm_info.c */ | ||
| 54 | int drm_name_info(struct seq_file *m, void *data); | ||
| 55 | int drm_vm_info(struct seq_file *m, void *data); | ||
| 56 | int drm_bufs_info(struct seq_file *m, void *data); | ||
| 57 | int drm_vblank_info(struct seq_file *m, void *data); | ||
| 58 | int drm_clients_info(struct seq_file *m, void* data); | ||
| 59 | int drm_gem_name_info(struct seq_file *m, void *data); | ||
| 60 | |||
| 61 | /* drm_irq.c */ | ||
| 62 | int drm_control(struct drm_device *dev, void *data, | ||
| 63 | struct drm_file *file_priv); | ||
| 64 | |||
| 65 | /* drm_auth.c */ | ||
| 66 | int drm_getmagic(struct drm_device *dev, void *data, | ||
| 67 | struct drm_file *file_priv); | ||
| 68 | int drm_authmagic(struct drm_device *dev, void *data, | ||
| 69 | struct drm_file *file_priv); | ||
| 70 | int drm_remove_magic(struct drm_master *master, drm_magic_t magic); | ||
| 71 | |||
| 72 | /* drm_sysfs.c */ | ||
| 73 | struct class *drm_sysfs_create(struct module *owner, char *name); | ||
| 74 | void drm_sysfs_destroy(void); | ||
| 75 | struct device *drm_sysfs_minor_alloc(struct drm_minor *minor); | ||
| 76 | int drm_sysfs_connector_add(struct drm_connector *connector); | ||
| 77 | void drm_sysfs_connector_remove(struct drm_connector *connector); | ||
| 78 | |||
| 79 | /* drm_gem.c */ | ||
| 80 | int drm_gem_init(struct drm_device *dev); | ||
| 81 | void drm_gem_destroy(struct drm_device *dev); | ||
| 82 | int drm_gem_handle_create_tail(struct drm_file *file_priv, | ||
| 83 | struct drm_gem_object *obj, | ||
| 84 | u32 *handlep); | ||
| 85 | int drm_gem_close_ioctl(struct drm_device *dev, void *data, | ||
| 86 | struct drm_file *file_priv); | ||
| 87 | int drm_gem_flink_ioctl(struct drm_device *dev, void *data, | ||
| 88 | struct drm_file *file_priv); | ||
| 89 | int drm_gem_open_ioctl(struct drm_device *dev, void *data, | ||
| 90 | struct drm_file *file_priv); | ||
| 91 | void drm_gem_open(struct drm_device *dev, struct drm_file *file_private); | ||
| 92 | void drm_gem_release(struct drm_device *dev, struct drm_file *file_private); | ||
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 99d578bad17e..2807a771f505 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
| 30 | #include <linux/dma-buf.h> | 30 | #include <linux/dma-buf.h> |
| 31 | #include <drm/drmP.h> | 31 | #include <drm/drmP.h> |
| 32 | #include "drm_internal.h" | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * DMA-BUF/GEM Object references and lifetime overview: | 35 | * DMA-BUF/GEM Object references and lifetime overview: |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index ab1a5f6dde8a..cc3d6d6d67e0 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <drm/drm_sysfs.h> | 21 | #include <drm/drm_sysfs.h> |
| 22 | #include <drm/drm_core.h> | 22 | #include <drm/drm_core.h> |
| 23 | #include <drm/drmP.h> | 23 | #include <drm/drmP.h> |
| 24 | #include "drm_internal.h" | ||
| 24 | 25 | ||
| 25 | #define to_drm_minor(d) dev_get_drvdata(d) | 26 | #define to_drm_minor(d) dev_get_drvdata(d) |
| 26 | #define to_drm_connector(d) dev_get_drvdata(d) | 27 | #define to_drm_connector(d) dev_get_drvdata(d) |
