diff options
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 10 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 959008ad65a8..e42b0a357fb8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
| @@ -508,9 +508,10 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, | |||
| 508 | struct drm_file *file_priv); | 508 | struct drm_file *file_priv); |
| 509 | unsigned long amdgpu_gem_timeout(uint64_t timeout_ns); | 509 | unsigned long amdgpu_gem_timeout(uint64_t timeout_ns); |
| 510 | struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj); | 510 | struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj); |
| 511 | struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev, | 511 | struct drm_gem_object * |
| 512 | struct dma_buf_attachment *attach, | 512 | amdgpu_gem_prime_import_sg_table(struct drm_device *dev, |
| 513 | struct sg_table *sg); | 513 | struct dma_buf_attachment *attach, |
| 514 | struct sg_table *sg); | ||
| 514 | struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, | 515 | struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, |
| 515 | struct drm_gem_object *gobj, | 516 | struct drm_gem_object *gobj, |
| 516 | int flags); | 517 | int flags); |
| @@ -1187,7 +1188,8 @@ struct amdgpu_gfx { | |||
| 1187 | 1188 | ||
| 1188 | int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, | 1189 | int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, |
| 1189 | unsigned size, struct amdgpu_ib *ib); | 1190 | unsigned size, struct amdgpu_ib *ib); |
| 1190 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f); | 1191 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, |
| 1192 | struct fence *f); | ||
| 1191 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, | 1193 | int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, |
| 1192 | struct amdgpu_ib *ib, struct fence *last_vm_update, | 1194 | struct amdgpu_ib *ib, struct fence *last_vm_update, |
| 1193 | struct amdgpu_job *job, struct fence **f); | 1195 | struct amdgpu_job *job, struct fence **f); |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 89f33d5e8731..910556136fde 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
| @@ -88,7 +88,8 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, | |||
| 88 | * | 88 | * |
| 89 | * Free an IB (all asics). | 89 | * Free an IB (all asics). |
| 90 | */ | 90 | */ |
| 91 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f) | 91 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, |
| 92 | struct fence *f) | ||
| 92 | { | 93 | { |
| 93 | amdgpu_sa_bo_free(adev, &ib->sa_bo, f); | 94 | amdgpu_sa_bo_free(adev, &ib->sa_bo, f); |
| 94 | } | 95 | } |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c index be6388f73ba2..7700dc22f243 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | |||
| @@ -57,9 +57,10 @@ void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) | |||
| 57 | ttm_bo_kunmap(&bo->dma_buf_vmap); | 57 | ttm_bo_kunmap(&bo->dma_buf_vmap); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev, | 60 | struct drm_gem_object * |
| 61 | struct dma_buf_attachment *attach, | 61 | amdgpu_gem_prime_import_sg_table(struct drm_device *dev, |
| 62 | struct sg_table *sg) | 62 | struct dma_buf_attachment *attach, |
| 63 | struct sg_table *sg) | ||
| 63 | { | 64 | { |
| 64 | struct reservation_object *resv = attach->dmabuf->resv; | 65 | struct reservation_object *resv = attach->dmabuf->resv; |
| 65 | struct amdgpu_device *adev = dev->dev_private; | 66 | struct amdgpu_device *adev = dev->dev_private; |
