diff options
author | Rob Clark <robdclark@gmail.com> | 2013-09-28 11:28:35 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2013-11-01 12:39:44 -0400 |
commit | 05b849111c07454fd2f5b074ca7eb56ccdb8828c (patch) | |
tree | 4f720dff8a12e0c5dec385b6e81f6475a69b554c /drivers/gpu/drm/msm/msm_drv.h | |
parent | 959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff) |
drm/msm: prime support
Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.h')
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index df8f1d084bc1..9ce90c267ef8 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h | |||
@@ -141,13 +141,20 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj); | |||
141 | int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id, | 141 | int msm_gem_get_iova_locked(struct drm_gem_object *obj, int id, |
142 | uint32_t *iova); | 142 | uint32_t *iova); |
143 | int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint32_t *iova); | 143 | int msm_gem_get_iova(struct drm_gem_object *obj, int id, uint32_t *iova); |
144 | struct page **msm_gem_get_pages(struct drm_gem_object *obj); | ||
145 | void msm_gem_put_pages(struct drm_gem_object *obj); | ||
144 | void msm_gem_put_iova(struct drm_gem_object *obj, int id); | 146 | void msm_gem_put_iova(struct drm_gem_object *obj, int id); |
145 | int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, | 147 | int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev, |
146 | struct drm_mode_create_dumb *args); | 148 | struct drm_mode_create_dumb *args); |
147 | int msm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev, | ||
148 | uint32_t handle); | ||
149 | int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, | 149 | int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, |
150 | uint32_t handle, uint64_t *offset); | 150 | uint32_t handle, uint64_t *offset); |
151 | struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj); | ||
152 | void *msm_gem_prime_vmap(struct drm_gem_object *obj); | ||
153 | void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); | ||
154 | struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, | ||
155 | size_t size, struct sg_table *sg); | ||
156 | int msm_gem_prime_pin(struct drm_gem_object *obj); | ||
157 | void msm_gem_prime_unpin(struct drm_gem_object *obj); | ||
151 | void *msm_gem_vaddr_locked(struct drm_gem_object *obj); | 158 | void *msm_gem_vaddr_locked(struct drm_gem_object *obj); |
152 | void *msm_gem_vaddr(struct drm_gem_object *obj); | 159 | void *msm_gem_vaddr(struct drm_gem_object *obj); |
153 | int msm_gem_queue_inactive_work(struct drm_gem_object *obj, | 160 | int msm_gem_queue_inactive_work(struct drm_gem_object *obj, |
@@ -163,6 +170,8 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, | |||
163 | uint32_t size, uint32_t flags, uint32_t *handle); | 170 | uint32_t size, uint32_t flags, uint32_t *handle); |
164 | struct drm_gem_object *msm_gem_new(struct drm_device *dev, | 171 | struct drm_gem_object *msm_gem_new(struct drm_device *dev, |
165 | uint32_t size, uint32_t flags); | 172 | uint32_t size, uint32_t flags); |
173 | struct drm_gem_object *msm_gem_import(struct drm_device *dev, | ||
174 | uint32_t size, struct sg_table *sgt); | ||
166 | 175 | ||
167 | struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane); | 176 | struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane); |
168 | const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb); | 177 | const struct msm_format *msm_framebuffer_format(struct drm_framebuffer *fb); |