Commit 8dc9fbbf authored by Nayan Deshmukh's avatar Nayan Deshmukh Committed by Alex Deucher
Browse files

drm/scheduler: add a pointer to scheduler in the rq 



This patch is in preparation for a better load balancing in
scheduler. It allows us to associate entities with the
run queues instead of binding them to a scheduler.

Signed-off-by: default avatarNayan Deshmukh <nayan26deshmukh@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7d85e1d

drivers/gpu/drm/scheduler/gpu_scheduler.c

+4 −2
Original line number Diff line number Diff line
@@ -69,11 +69,13 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb); 
 *

 * Initializes a scheduler runqueue.

 */

static void drm_sched_rq_init(struct drm_sched_rq *rq)

static void drm_sched_rq_init(struct drm_gpu_scheduler *sched,

			      struct drm_sched_rq *rq)

{

	spin_lock_init(&rq->lock);

	INIT_LIST_HEAD(&rq->entities);

	rq->current_entity = NULL;

	rq->sched = sched;

}



/**
@@ -926,7 +928,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, 
	sched->timeout = timeout;

	sched->hang_limit = hang_limit;

	for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_MAX; i++)

		drm_sched_rq_init(&sched->sched_rq[i]);

		drm_sched_rq_init(sched, &sched->sched_rq[i]);



	init_waitqueue_head(&sched->wake_up_worker);

	init_waitqueue_head(&sched->job_scheduled);

include/drm/gpu_scheduler.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ struct drm_sched_entity { 
 * struct drm_sched_rq - queue of entities to be scheduled.

 *

 * @lock: to modify the entities list.

 * @sched: the scheduler to which this rq belongs to.

 * @entities: list of the entities to be scheduled.

 * @current_entity: the entity which is to be scheduled.

 *
@@ -102,6 +103,7 @@ struct drm_sched_entity { 
 */

struct drm_sched_rq {

	spinlock_t			lock;

	struct drm_gpu_scheduler	*sched;

	struct list_head		entities;

	struct drm_sched_entity		*current_entity;

};