aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-05-03 12:46:19 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-05-11 12:31:18 -0400
commit4d9c514d8ccff2b4bd0db5d3e178c0c0b3f3bc77 (patch)
treef3fb27b84f3fcc7163aba9953f28750ab07d27bd /drivers/gpu
parent794ff5710eb1d8bea4acc79cd005f6342623ec46 (diff)
drm/amdgpu: two minor 80 char fixes
Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Tom St Denis <tom.stdenis@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h10
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c3
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c7
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);
509unsigned long amdgpu_gem_timeout(uint64_t timeout_ns); 509unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);
510struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj); 510struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
511struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev, 511struct drm_gem_object *
512 struct dma_buf_attachment *attach, 512amdgpu_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);
514struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev, 515struct 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
1188int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 1189int 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);
1190void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f); 1191void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,
1192 struct fence *f);
1191int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 1193int 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 */
91void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f) 91void 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
60struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev, 60struct drm_gem_object *
61 struct dma_buf_attachment *attach, 61amdgpu_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;