diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 11c7a6a330c1..377c21f531e4 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -940,6 +940,8 @@ struct drm_i915_gem_object { | |||
940 | struct scatterlist *sg_list; | 940 | struct scatterlist *sg_list; |
941 | int num_sg; | 941 | int num_sg; |
942 | 942 | ||
943 | /* prime dma-buf support */ | ||
944 | struct sg_table *sg_table; | ||
943 | /** | 945 | /** |
944 | * Used for performing relocations during execbuffer insertion. | 946 | * Used for performing relocations during execbuffer insertion. |
945 | */ | 947 | */ |
@@ -1245,6 +1247,8 @@ int __must_check i915_gem_object_unbind(struct drm_i915_gem_object *obj); | |||
1245 | void i915_gem_release_mmap(struct drm_i915_gem_object *obj); | 1247 | void i915_gem_release_mmap(struct drm_i915_gem_object *obj); |
1246 | void i915_gem_lastclose(struct drm_device *dev); | 1248 | void i915_gem_lastclose(struct drm_device *dev); |
1247 | 1249 | ||
1250 | int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj, | ||
1251 | gfp_t gfpmask); | ||
1248 | int __must_check i915_mutex_lock_interruptible(struct drm_device *dev); | 1252 | int __must_check i915_mutex_lock_interruptible(struct drm_device *dev); |
1249 | int __must_check i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj); | 1253 | int __must_check i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj); |
1250 | int i915_gem_object_sync(struct drm_i915_gem_object *obj, | 1254 | int i915_gem_object_sync(struct drm_i915_gem_object *obj, |
@@ -1342,6 +1346,13 @@ i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev, | |||
1342 | int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, | 1346 | int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, |
1343 | enum i915_cache_level cache_level); | 1347 | enum i915_cache_level cache_level); |
1344 | 1348 | ||
1349 | struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, | ||
1350 | struct dma_buf *dma_buf); | ||
1351 | |||
1352 | struct dma_buf *i915_gem_prime_export(struct drm_device *dev, | ||
1353 | struct drm_gem_object *gem_obj, int flags); | ||
1354 | |||
1355 | |||
1345 | /* i915_gem_gtt.c */ | 1356 | /* i915_gem_gtt.c */ |
1346 | int __must_check i915_gem_init_aliasing_ppgtt(struct drm_device *dev); | 1357 | int __must_check i915_gem_init_aliasing_ppgtt(struct drm_device *dev); |
1347 | void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev); | 1358 | void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev); |