Commit 0e10e9a1 authored Aug 05, 2021 by Daniel Vetter

drm/sched: drop entity parameter from drm_sched_push_job



Originally a job was only bound to the queue when we pushed this, but
now that's done in drm_sched_job_init, making that parameter entirely
redundant.

Remove it.

The same applies to the context parameter in
lima_sched_context_queue_task, simplify that too.

v2:
Rebase on top of msm adopting drm/sched

Reviewed-by: Christian König <christian.koenig@amd.com>
Acked-by: Emma Anholt <emma@anholt.net>
Acked-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: Steven Price <steven.price@arm.com> (v1)
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Cc: Emma Anholt <emma@anholt.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Nirmoy Das <nirmoy.das@amd.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Chen Li <chenli@uniontech.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Deepak R Varma <mh12gx2825@gmail.com>
Cc: Kevin Wang <kevin1.wang@amd.com>
Cc: Luben Tuikov <luben.tuikov@amd.com>
Cc: "Marek Olšák" <marek.olsak@amd.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Cc: Dennis Li <Dennis.Li@amd.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: etnaviv@lists.freedesktop.org
Cc: lima@lists.freedesktop.org
Cc: linux-media@vger.kernel.org
Cc: linaro-mm-sig@lists.linaro.org
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Melissa Wen <mwen@igalia.com>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20210805104705.862416-6-daniel.vetter@ffwll.ch

parent ebd5f742

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1261,7 +1261,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,

		trace_amdgpu_cs_ioctl(job);
		amdgpu_vm_bo_trace_cs(&fpriv->vm, &p->ticket);
		drm_sched_entity_push_job(&job->base, entity);
		drm_sched_entity_push_job(&job->base);

		amdgpu_vm_move_to_lru_tail(p->adev, &fpriv->vm);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ int amdgpu_job_submit(struct amdgpu_job job, struct drm_sched_entity entity,

		*f = dma_fence_get(&job->base.s_fence->finished);
		amdgpu_job_free_resources(job);
		drm_sched_entity_push_job(&job->base, entity);
		drm_sched_entity_push_job(&job->base);

		return 0;
		}

drivers/gpu/drm/etnaviv/etnaviv_sched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ int etnaviv_sched_push_job(struct drm_sched_entity *sched_entity,
		/* the scheduler holds on to the job now */
		kref_get(&submit->refcount);

		drm_sched_entity_push_job(&submit->sched_job, sched_entity);
		drm_sched_entity_push_job(&submit->sched_job);

		out_unlock:
		mutex_unlock(&submit->gpu->fence_lock);

drivers/gpu/drm/lima/lima_gem.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -359,8 +359,7 @@ int lima_gem_submit(struct drm_file file, struct lima_submit submit)
		goto err_out2;
		}

		fence = lima_sched_context_queue_task(
		submit->ctx->context + submit->pipe, submit->task);
		fence = lima_sched_context_queue_task(submit->task);

		for (i = 0; i < submit->nr_bos; i++) {
		if (submit->bos[i].flags & LIMA_SUBMIT_BO_WRITE)

drivers/gpu/drm/lima/lima_sched.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -177,13 +177,12 @@ void lima_sched_context_fini(struct lima_sched_pipe *pipe,
		drm_sched_entity_fini(&context->base);
		}

		struct dma_fence lima_sched_context_queue_task(struct lima_sched_context context,
		struct lima_sched_task *task)
		struct dma_fence lima_sched_context_queue_task(struct lima_sched_task task)
		{
		struct dma_fence *fence = dma_fence_get(&task->base.s_fence->finished);

		trace_lima_task_submit(task);
		drm_sched_entity_push_job(&task->base, &context->base);
		drm_sched_entity_push_job(&task->base);
		return fence;
		}