Эх сурвалжийг харах

drm/amd/sched: revise priority number

big number is to high priority.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Chunming Zhou 8 жил өмнө
parent
commit
153de9dff9

+ 2 - 2
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

@@ -502,7 +502,7 @@ amd_sched_select_entity(struct amd_gpu_scheduler *sched)
 		return NULL;
 		return NULL;
 
 
 	/* Kernel run queue has higher priority than normal run queue*/
 	/* Kernel run queue has higher priority than normal run queue*/
-	for (i = 0; i < AMD_SCHED_MAX_PRIORITY; i++) {
+	for (i = AMD_SCHED_PRIORITY_MAX - 1; i >= AMD_SCHED_PRIORITY_MIN; i--) {
 		entity = amd_sched_rq_select_entity(&sched->sched_rq[i]);
 		entity = amd_sched_rq_select_entity(&sched->sched_rq[i]);
 		if (entity)
 		if (entity)
 			break;
 			break;
@@ -610,7 +610,7 @@ int amd_sched_init(struct amd_gpu_scheduler *sched,
 	sched->hw_submission_limit = hw_submission;
 	sched->hw_submission_limit = hw_submission;
 	sched->name = name;
 	sched->name = name;
 	sched->timeout = timeout;
 	sched->timeout = timeout;
-	for (i = 0; i < AMD_SCHED_MAX_PRIORITY; i++)
+	for (i = AMD_SCHED_PRIORITY_MIN; i < AMD_SCHED_PRIORITY_MAX; i++)
 		amd_sched_rq_init(&sched->sched_rq[i]);
 		amd_sched_rq_init(&sched->sched_rq[i]);
 
 
 	init_waitqueue_head(&sched->wake_up_worker);
 	init_waitqueue_head(&sched->wake_up_worker);

+ 5 - 4
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

@@ -108,9 +108,10 @@ struct amd_sched_backend_ops {
 };
 };
 
 
 enum amd_sched_priority {
 enum amd_sched_priority {
-	AMD_SCHED_PRIORITY_KERNEL = 0,
-	AMD_SCHED_PRIORITY_NORMAL,
-	AMD_SCHED_MAX_PRIORITY
+	AMD_SCHED_PRIORITY_MIN,
+	AMD_SCHED_PRIORITY_NORMAL = AMD_SCHED_PRIORITY_MIN,
+	AMD_SCHED_PRIORITY_KERNEL,
+	AMD_SCHED_PRIORITY_MAX
 };
 };
 
 
 /**
 /**
@@ -121,7 +122,7 @@ struct amd_gpu_scheduler {
 	uint32_t			hw_submission_limit;
 	uint32_t			hw_submission_limit;
 	long				timeout;
 	long				timeout;
 	const char			*name;
 	const char			*name;
-	struct amd_sched_rq		sched_rq[AMD_SCHED_MAX_PRIORITY];
+	struct amd_sched_rq		sched_rq[AMD_SCHED_PRIORITY_MAX];
 	wait_queue_head_t		wake_up_worker;
 	wait_queue_head_t		wake_up_worker;
 	wait_queue_head_t		job_scheduled;
 	wait_queue_head_t		job_scheduled;
 	atomic_t			hw_rq_count;
 	atomic_t			hw_rq_count;