diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-09 05:03:15 -0500 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-30 08:04:00 -0400 |
commit | f4f4e3e3e9f3bde110067b9e4487cb267d90055a (patch) | |
tree | 8a90f83235d7ea09adc9ac64fb44a87e823feddb /include/drm/ttm | |
parent | b5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (diff) |
drm/ttm: add reservation_object as argument to ttm_bo_init
This allows importing reservation objects from dma-bufs.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'include/drm/ttm')
-rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index 70b44917c368..0ccf7f267ff9 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
@@ -460,6 +460,7 @@ size_t ttm_bo_dma_acc_size(struct ttm_bo_device *bdev, | |||
460 | * point to the shmem object backing a GEM object if TTM is used to back a | 460 | * point to the shmem object backing a GEM object if TTM is used to back a |
461 | * GEM user interface. | 461 | * GEM user interface. |
462 | * @acc_size: Accounted size for this object. | 462 | * @acc_size: Accounted size for this object. |
463 | * @resv: Pointer to a reservation_object, or NULL to let ttm allocate one. | ||
463 | * @destroy: Destroy function. Use NULL for kfree(). | 464 | * @destroy: Destroy function. Use NULL for kfree(). |
464 | * | 465 | * |
465 | * This function initializes a pre-allocated struct ttm_buffer_object. | 466 | * This function initializes a pre-allocated struct ttm_buffer_object. |
@@ -487,6 +488,7 @@ extern int ttm_bo_init(struct ttm_bo_device *bdev, | |||
487 | struct file *persistent_swap_storage, | 488 | struct file *persistent_swap_storage, |
488 | size_t acc_size, | 489 | size_t acc_size, |
489 | struct sg_table *sg, | 490 | struct sg_table *sg, |
491 | struct reservation_object *resv, | ||
490 | void (*destroy) (struct ttm_buffer_object *)); | 492 | void (*destroy) (struct ttm_buffer_object *)); |
491 | 493 | ||
492 | /** | 494 | /** |