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

drm/amdgpu: revert "partial revert "remove ctx->lock" v2" 



This reverts commit 94f4c496.

We found that the bo_list is missing a protection for its list entries.
Since that is fixed now this workaround can be removed again.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 736ec9fa

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

+6 −15
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, union drm_amdgpu_cs 
		goto free_chunk;

	}



	mutex_lock(&p->ctx->lock);



	/* skip guilty context job */

	if (atomic_read(&p->ctx->guilty) == 1) {

		ret = -ECANCELED;
@@ -691,7 +689,6 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, 
	dma_fence_put(parser->fence);



	if (parser->ctx) {

		mutex_unlock(&parser->ctx->lock);

		amdgpu_ctx_put(parser->ctx);

	}

	if (parser->bo_list)
@@ -1138,9 +1135,6 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, 
{

	int i, r;



	/* TODO: Investigate why we still need the context lock */

	mutex_unlock(&p->ctx->lock);



	for (i = 0; i < p->nchunks; ++i) {

		struct amdgpu_cs_chunk *chunk;
@@ -1151,34 +1145,32 @@ static int amdgpu_cs_dependencies(struct amdgpu_device *adev, 
		case AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES:

			r = amdgpu_cs_process_fence_dep(p, chunk);

			if (r)

				goto out;

				return r;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_IN:

			r = amdgpu_cs_process_syncobj_in_dep(p, chunk);

			if (r)

				goto out;

				return r;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_OUT:

			r = amdgpu_cs_process_syncobj_out_dep(p, chunk);

			if (r)

				goto out;

				return r;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_WAIT:

			r = amdgpu_cs_process_syncobj_timeline_in_dep(p, chunk);

			if (r)

				goto out;

				return r;

			break;

		case AMDGPU_CHUNK_ID_SYNCOBJ_TIMELINE_SIGNAL:

			r = amdgpu_cs_process_syncobj_timeline_out_dep(p, chunk);

			if (r)

				goto out;

				return r;

			break;

		}

	}



out:

	mutex_lock(&p->ctx->lock);

	return r;

	return 0;

}



static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)
@@ -1340,7 +1332,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		goto out;



	r = amdgpu_cs_submit(&parser, cs);



out:

	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);

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

+0 −2
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static int amdgpu_ctx_init(struct amdgpu_ctx_mgr *mgr, int32_t priority, 
	kref_init(&ctx->refcount);

	ctx->mgr = mgr;

	spin_lock_init(&ctx->ring_lock);

	mutex_init(&ctx->lock);



	ctx->reset_counter = atomic_read(&mgr->adev->gpu_reset_counter);

	ctx->reset_counter_query = ctx->reset_counter;
@@ -407,7 +406,6 @@ static void amdgpu_ctx_fini(struct kref *ref) 
		drm_dev_exit(idx);

	}



	mutex_destroy(&ctx->lock);

	kfree(ctx);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct amdgpu_ctx { 
	bool				preamble_presented;

	int32_t				init_priority;

	int32_t				override_priority;

	struct mutex			lock;

	atomic_t			guilty;

	unsigned long			ras_counter_ce;

	unsigned long			ras_counter_ue;