From 50b099030bb493604601a985b5fb3a8c5962aab9 Mon Sep 17 00:00:00 2001 From: Niranjana Vishwanathapura Date: Mon, 7 Aug 2023 15:43:35 +0000 Subject: [PATCH] drm/xe: Simplify engine class sched_props setting Shortens the too long code lines. Reviewed-by: Tejas Upadhyay Signed-off-by: Niranjana Vishwanathapura Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/xe/xe_hw_engine.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c index b8fcc6e985cfc..c445406844622 100644 --- a/drivers/gpu/drm/xe/xe_hw_engine.c +++ b/drivers/gpu/drm/xe/xe_hw_engine.c @@ -362,22 +362,20 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe, hwe->fence_irq = >->fence_irq[info->class]; hwe->engine_id = id; - if (!gt->eclass[hwe->class].sched_props.job_timeout_ms) { - gt->eclass[hwe->class].sched_props.job_timeout_ms = 5 * 1000; - gt->eclass[hwe->class].sched_props.job_timeout_min = XE_HW_ENGINE_JOB_TIMEOUT_MIN; - gt->eclass[hwe->class].sched_props.job_timeout_max = XE_HW_ENGINE_JOB_TIMEOUT_MAX; - gt->eclass[hwe->class].sched_props.timeslice_us = 1 * 1000; - gt->eclass[hwe->class].sched_props.timeslice_min = XE_HW_ENGINE_TIMESLICE_MIN; - gt->eclass[hwe->class].sched_props.timeslice_max = XE_HW_ENGINE_TIMESLICE_MAX; - gt->eclass[hwe->class].sched_props.preempt_timeout_us = 640 * 1000; - gt->eclass[hwe->class].sched_props.preempt_timeout_min = - XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN; - gt->eclass[hwe->class].sched_props.preempt_timeout_max = - XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX; + hwe->eclass = >->eclass[hwe->class]; + if (!hwe->eclass->sched_props.job_timeout_ms) { + hwe->eclass->sched_props.job_timeout_ms = 5 * 1000; + hwe->eclass->sched_props.job_timeout_min = XE_HW_ENGINE_JOB_TIMEOUT_MIN; + hwe->eclass->sched_props.job_timeout_max = XE_HW_ENGINE_JOB_TIMEOUT_MAX; + hwe->eclass->sched_props.timeslice_us = 1 * 1000; + hwe->eclass->sched_props.timeslice_min = XE_HW_ENGINE_TIMESLICE_MIN; + hwe->eclass->sched_props.timeslice_max = XE_HW_ENGINE_TIMESLICE_MAX; + hwe->eclass->sched_props.preempt_timeout_us = 640 * 1000; + hwe->eclass->sched_props.preempt_timeout_min = XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN; + hwe->eclass->sched_props.preempt_timeout_max = XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX; /* Record default props */ - gt->eclass[hwe->class].defaults = gt->eclass[hwe->class].sched_props; + hwe->eclass->defaults = hwe->eclass->sched_props; } - hwe->eclass = >->eclass[hwe->class]; xe_reg_sr_init(&hwe->reg_sr, hwe->name, gt_to_xe(gt)); xe_wa_process_engine(hwe); -- 2.30.2