Commit 56e44960 authored by Luben Tuikov's avatar Luben Tuikov
Browse files

drm/sched: Convert the GPU scheduler to variable number of run-queues 



The GPU scheduler has now a variable number of run-queues, which are set up at
drm_sched_init() time. This way, each driver announces how many run-queues it
requires (supports) per each GPU scheduler it creates. Note, that run-queues
correspond to scheduler "priorities", thus if the number of run-queues is set
to 1 at drm_sched_init(), then that scheduler supports a single run-queue,
i.e. single "priority". If a driver further sets a single entity per
run-queue, then this creates a 1-to-1 correspondence between a scheduler and
a scheduled entity.

Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Qiang Yu <yuq825@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Danilo Krummrich <dakr@redhat.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Emma Anholt <emma@anholt.net>
Cc: etnaviv@lists.freedesktop.org
Cc: lima@lists.freedesktop.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20231023032251.164775-1-luben.tuikov@amd.com
parent 3ddba96b

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

+1 −0
Original line number Diff line number Diff line
@@ -2280,6 +2280,7 @@ static int amdgpu_device_init_schedulers(struct amdgpu_device *adev) 
		}



		r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,

				   DRM_SCHED_PRIORITY_COUNT,

				   ring->num_hw_submission, 0,

				   timeout, adev->reset_domain->wq,

				   ring->sched_score, ring->name,

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

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ void amdgpu_job_stop_all_jobs_on_sched(struct drm_gpu_scheduler *sched) 
	int i;



	/* Signal all jobs not yet scheduled */

	for (i = DRM_SCHED_PRIORITY_COUNT - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) {

		struct drm_sched_rq *rq = &sched->sched_rq[i];

	for (i = sched->num_rqs - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) {

		struct drm_sched_rq *rq = sched->sched_rq[i];

		spin_lock(&rq->lock);

		list_for_each_entry(s_entity, &rq->entities, list) {

			while ((s_job = to_drm_sched_job(spsc_queue_pop(&s_entity->job_queue)))) {

drivers/gpu/drm/etnaviv/etnaviv_sched.c

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int etnaviv_sched_init(struct etnaviv_gpu *gpu) 
	int ret;



	ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops,

			     DRM_SCHED_PRIORITY_COUNT,

			     etnaviv_hw_jobs_limit, etnaviv_job_hang_limit,

			     msecs_to_jiffies(500), NULL, NULL,

			     dev_name(gpu->dev), gpu->dev);

drivers/gpu/drm/lima/lima_sched.c

+3 −1
Original line number Diff line number Diff line
@@ -488,7 +488,9 @@ int lima_sched_pipe_init(struct lima_sched_pipe *pipe, const char *name) 


	INIT_WORK(&pipe->recover_work, lima_sched_recover_work);



	return drm_sched_init(&pipe->base, &lima_sched_ops, 1,

	return drm_sched_init(&pipe->base, &lima_sched_ops,

			      DRM_SCHED_PRIORITY_COUNT,

			      1,

			      lima_job_hang_limit,

			      msecs_to_jiffies(timeout), NULL,

			      NULL, name, pipe->ldev->dev);

drivers/gpu/drm/msm/msm_ringbuffer.c

+3 −2
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id, 
	sched_timeout = MAX_SCHEDULE_TIMEOUT;



	ret = drm_sched_init(&ring->sched, &msm_sched_ops,

			     DRM_SCHED_PRIORITY_COUNT,

			     num_hw_submissions, 0, sched_timeout,

			     NULL, NULL, to_msm_bo(ring->bo)->name, gpu->dev->dev);

	if (ret) {