Commit 85eff200 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: amdgpu_ctx_add_fence can't fail 



No more waiting for a fence done here.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a9a8a788

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

+1 −9
Original line number Diff line number Diff line
@@ -1217,15 +1217,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	job->owner = p->filp;

	p->fence = dma_fence_get(&job->base.s_fence->finished);



	r = amdgpu_ctx_add_fence(p->ctx, entity, p->fence, &seq);

	if (r) {

		dma_fence_put(p->fence);

		dma_fence_put(&job->base.s_fence->finished);

		amdgpu_job_free(job);

		amdgpu_mn_unlock(p->mn);

		return r;

	}



	amdgpu_ctx_add_fence(p->ctx, entity, p->fence, &seq);

	amdgpu_cs_post_dependencies(p);



	if ((job->preamble_status & AMDGPU_PREAMBLE_IB_PRESENT) &&

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

+3 −5
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ int amdgpu_ctx_put(struct amdgpu_ctx *ctx) 
	return 0;

}



int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx,

void amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx,

			  struct drm_sched_entity *entity,

			  struct dma_fence *fence, uint64_t* handle)

{
@@ -458,8 +458,6 @@ int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx, 
	dma_fence_put(other);

	if (handle)

		*handle = seq;



	return 0;

}



struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,

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

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int amdgpu_ctx_put(struct amdgpu_ctx *ctx); 


int amdgpu_ctx_get_entity(struct amdgpu_ctx *ctx, u32 hw_ip, u32 instance,

			  u32 ring, struct drm_sched_entity **entity);

int amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx,

void amdgpu_ctx_add_fence(struct amdgpu_ctx *ctx,

			  struct drm_sched_entity *entity,

			  struct dma_fence *fence, uint64_t *seq);

struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,

CRA Git | Maintained and supported by SUSTech CRA and CCSE