diff options
| author | Niranjana Vishwanathapura <[email protected]> | 2023-08-07 14:58:38 +0000 |
|---|---|---|
| committer | Rodrigo Vivi <[email protected]> | 2023-12-21 11:40:20 -0500 |
| commit | a863b4163ab9d3f173aef0f1191a0c0b8ea41634 (patch) | |
| tree | e6d422d8db48bde3ea367a5ab4bd3b5223379945 | |
| parent | 50b099030bb493604601a985b5fb3a8c5962aab9 (diff) | |
drm/xe: Add CONFIG_DRM_XE_PREEMPT_TIMEOUT
Allow preemption timeout to be specified as a config option.
v2: Change unit to microseconds (Tejas)
v3: Remove get_default_preempt_timeout()
Reviewed-by: Tejas Upadhyay <[email protected]>
Signed-off-by: Niranjana Vishwanathapura <[email protected]>
Signed-off-by: Rodrigo Vivi <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/xe/Kconfig.profile | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_hw_engine.c | 5 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/xe_hw_engine.h | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/Kconfig.profile b/drivers/gpu/drm/xe/Kconfig.profile index 51951c8149a1..ba17a25e8db3 100644 --- a/drivers/gpu/drm/xe/Kconfig.profile +++ b/drivers/gpu/drm/xe/Kconfig.profile @@ -22,6 +22,14 @@ config DRM_XE_TIMESLICE_MIN help Configures the default min timeslice duration between multiple contexts by guc scheduling. +config DRM_XE_PREEMPT_TIMEOUT + int "Preempt timeout (us, jiffy granularity)" + default 640000 # microseconds + help + How long to wait (in microseconds) for a preemption event to occur + when submitting a new context. If the current context does not hit + an arbitration point and yield to HW before the timer expires, the + HW will be reset to allow the more important context to execute. config DRM_XE_PREEMPT_TIMEOUT_MAX int "Default max preempt timeout (us)" default 10000000 # microseconds diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c index c44540684462..4c812d04e182 100644 --- a/drivers/gpu/drm/xe/xe_hw_engine.c +++ b/drivers/gpu/drm/xe/xe_hw_engine.c @@ -370,7 +370,7 @@ static void hw_engine_init_early(struct xe_gt *gt, struct xe_hw_engine *hwe, 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_us = XE_HW_ENGINE_PREEMPT_TIMEOUT; 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 */ @@ -562,6 +562,9 @@ int xe_hw_engines_init_early(struct xe_gt *gt) read_copy_fuses(gt); read_compute_fuses(gt); + BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT < XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN); + BUILD_BUG_ON(XE_HW_ENGINE_PREEMPT_TIMEOUT > XE_HW_ENGINE_PREEMPT_TIMEOUT_MAX); + for (i = 0; i < ARRAY_SIZE(gt->hw_engines); i++) hw_engine_init_early(gt, >->hw_engines[i], i); diff --git a/drivers/gpu/drm/xe/xe_hw_engine.h b/drivers/gpu/drm/xe/xe_hw_engine.h index 3d37d6d44261..71968ee2f600 100644 --- a/drivers/gpu/drm/xe/xe_hw_engine.h +++ b/drivers/gpu/drm/xe/xe_hw_engine.h @@ -30,6 +30,11 @@ struct drm_printer; #else #define XE_HW_ENGINE_TIMESLICE_MAX (10 * 1000 * 1000) #endif +#ifdef CONFIG_DRM_XE_PREEMPT_TIMEOUT +#define XE_HW_ENGINE_PREEMPT_TIMEOUT CONFIG_DRM_XE_PREEMPT_TIMEOUT +#else +#define XE_HW_ENGINE_PREEMPT_TIMEOUT (640 * 1000) +#endif #ifdef CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN #define XE_HW_ENGINE_PREEMPT_TIMEOUT_MIN CONFIG_DRM_XE_PREEMPT_TIMEOUT_MIN #else |