Skip to content

Commit 770bd1d

Browse files
ifdumbrost05
authored andcommitted
drm/xe/hw_engine_group: Ensure safe transition between execution modes
Provide a way to safely transition execution modes of the hw engine group ahead of the actual execution. When necessary, either wait for running jobs to complete or preempt them, thus ensuring mutual exclusion between execution modes. Unlike a mutex, the rw_semaphore used in this context allows multiple submissions in the same mode. v2: Use lockdep_assert_held_write, add annotations (Matt Brost) v3: Fix kernel doc, remove redundant code (Matt Brost) v4: Now that xe_hw_engine_group_suspend_faulting_lr_jobs can fail, propagate the error to the caller (Matt Brost) Signed-off-by: Francois Dugast <francois.dugast@intel.com> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240809155156.1955925-9-francois.dugast@intel.com
1 parent 2750ff9 commit 770bd1d

File tree

2 files changed

+80
-0
lines changed

2 files changed

+80
-0
lines changed

drivers/gpu/drm/xe/xe_hw_engine_group.c

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,78 @@ static int xe_hw_engine_group_wait_for_dma_fence_jobs(struct xe_hw_engine_group
235235

236236
return 0;
237237
}
238+
239+
static int switch_mode(struct xe_hw_engine_group *group)
240+
{
241+
int err = 0;
242+
enum xe_hw_engine_group_execution_mode new_mode;
243+
244+
lockdep_assert_held_write(&group->mode_sem);
245+
246+
switch (group->cur_mode) {
247+
case EXEC_MODE_LR:
248+
new_mode = EXEC_MODE_DMA_FENCE;
249+
err = xe_hw_engine_group_suspend_faulting_lr_jobs(group);
250+
break;
251+
case EXEC_MODE_DMA_FENCE:
252+
new_mode = EXEC_MODE_LR;
253+
err = xe_hw_engine_group_wait_for_dma_fence_jobs(group);
254+
break;
255+
}
256+
257+
if (err)
258+
return err;
259+
260+
group->cur_mode = new_mode;
261+
262+
return 0;
263+
}
264+
265+
/**
266+
* xe_hw_engine_group_get_mode() - Get the group to execute in the new mode
267+
* @group: The hw engine group
268+
* @new_mode: The new execution mode
269+
* @previous_mode: Pointer to the previous mode provided for use by caller
270+
*
271+
* Return: 0 if successful, -EINTR if locking failed.
272+
*/
273+
int xe_hw_engine_group_get_mode(struct xe_hw_engine_group *group,
274+
enum xe_hw_engine_group_execution_mode new_mode,
275+
enum xe_hw_engine_group_execution_mode *previous_mode)
276+
__acquires(&group->mode_sem)
277+
{
278+
int err = down_read_interruptible(&group->mode_sem);
279+
280+
if (err)
281+
return err;
282+
283+
*previous_mode = group->cur_mode;
284+
285+
if (new_mode != group->cur_mode) {
286+
up_read(&group->mode_sem);
287+
err = down_write_killable(&group->mode_sem);
288+
if (err)
289+
return err;
290+
291+
if (new_mode != group->cur_mode) {
292+
err = switch_mode(group);
293+
if (err) {
294+
up_write(&group->mode_sem);
295+
return err;
296+
}
297+
}
298+
downgrade_write(&group->mode_sem);
299+
}
300+
301+
return err;
302+
}
303+
304+
/**
305+
* xe_hw_engine_group_put() - Put the group
306+
* @group: The hw engine group
307+
*/
308+
void xe_hw_engine_group_put(struct xe_hw_engine_group *group)
309+
__releases(&group->mode_sem)
310+
{
311+
up_read(&group->mode_sem);
312+
}

drivers/gpu/drm/xe/xe_hw_engine_group.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ int xe_hw_engine_setup_groups(struct xe_gt *gt);
1717
int xe_hw_engine_group_add_exec_queue(struct xe_hw_engine_group *group, struct xe_exec_queue *q);
1818
void xe_hw_engine_group_del_exec_queue(struct xe_hw_engine_group *group, struct xe_exec_queue *q);
1919

20+
int xe_hw_engine_group_get_mode(struct xe_hw_engine_group *group,
21+
enum xe_hw_engine_group_execution_mode new_mode,
22+
enum xe_hw_engine_group_execution_mode *previous_mode);
23+
void xe_hw_engine_group_put(struct xe_hw_engine_group *group);
24+
2025
#endif

0 commit comments

Comments
 (0)