mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amdgpu:add hang_limit for sched(v2)
since gpu_scheduler source domain cannot access amdgpu variable so need create the hang_limit membewr for sched, and it can refer it for the upcoming GPU RESET patches v2: make hang_limit a parameter of sched_init() Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Chunming Zhou <David1.Zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
2f9d4084ca
commit
95aa9b1d97
3 changed files with 8 additions and 3 deletions
|
@ -446,7 +446,7 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,
|
|||
timeout = MAX_SCHEDULE_TIMEOUT;
|
||||
}
|
||||
r = amd_sched_init(&ring->sched, &amdgpu_sched_ops,
|
||||
num_hw_submission,
|
||||
num_hw_submission, amdgpu_job_hang_limit,
|
||||
timeout, ring->name);
|
||||
if (r) {
|
||||
DRM_ERROR("Failed to create scheduler on ring %s.\n",
|
||||
|
|
|
@ -676,13 +676,17 @@ static int amd_sched_main(void *param)
|
|||
*/
|
||||
int amd_sched_init(struct amd_gpu_scheduler *sched,
|
||||
const struct amd_sched_backend_ops *ops,
|
||||
unsigned hw_submission, long timeout, const char *name)
|
||||
unsigned hw_submission,
|
||||
unsigned hang_limit,
|
||||
long timeout,
|
||||
const char *name)
|
||||
{
|
||||
int i;
|
||||
sched->ops = ops;
|
||||
sched->hw_submission_limit = hw_submission;
|
||||
sched->name = name;
|
||||
sched->timeout = timeout;
|
||||
sched->hang_limit = hang_limit;
|
||||
for (i = AMD_SCHED_PRIORITY_MIN; i < AMD_SCHED_PRIORITY_MAX; i++)
|
||||
amd_sched_rq_init(&sched->sched_rq[i]);
|
||||
|
||||
|
|
|
@ -144,11 +144,12 @@ struct amd_gpu_scheduler {
|
|||
struct task_struct *thread;
|
||||
struct list_head ring_mirror_list;
|
||||
spinlock_t job_list_lock;
|
||||
int hang_limit;
|
||||
};
|
||||
|
||||
int amd_sched_init(struct amd_gpu_scheduler *sched,
|
||||
const struct amd_sched_backend_ops *ops,
|
||||
uint32_t hw_submission, long timeout, const char *name);
|
||||
uint32_t hw_submission, unsigned hang_limit, long timeout, const char *name);
|
||||
void amd_sched_fini(struct amd_gpu_scheduler *sched);
|
||||
|
||||
int amd_sched_entity_init(struct amd_gpu_scheduler *sched,
|
||||
|
|
Loading…
Reference in a new issue