Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d9c514d authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: two minor 80 char fixes 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 794ff571

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+6 −4
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, 
				struct drm_file *file_priv);

unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);

struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);

struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev,

struct drm_gem_object *

amdgpu_gem_prime_import_sg_table(struct drm_device *dev,

				 struct dma_buf_attachment *attach,

				 struct sg_table *sg);

struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
@@ -1187,7 +1188,8 @@ struct amdgpu_gfx { 


int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,

		  unsigned size, struct amdgpu_ib *ib);

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f);

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,

		    struct fence *f);

int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

		       struct amdgpu_ib *ib, struct fence *last_vm_update,

		       struct amdgpu_job *job, struct fence **f);

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
 *

 * Free an IB (all asics).

 */

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, struct fence *f)

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,

		    struct fence *f)

{

	amdgpu_sa_bo_free(adev, &ib->sa_bo, f);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c

+4 −3
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) 
	ttm_bo_kunmap(&bo->dma_buf_vmap);

}



struct drm_gem_object *amdgpu_gem_prime_import_sg_table(struct drm_device *dev,

struct drm_gem_object *

amdgpu_gem_prime_import_sg_table(struct drm_device *dev,

				 struct dma_buf_attachment *attach,

				 struct sg_table *sg)

{