Skip to content

Commit

Permalink
drm/xe: Assert runnable state in handle_sched_done
Browse files Browse the repository at this point in the history
Ensure G2H and KMD GuC machine match.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611144053.2805091-8-matthew.brost@intel.com
  • Loading branch information
Matthew Brost committed Jun 13, 2024
1 parent 41e1fa9 commit 7f4f492
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/gpu/drm/xe/xe_guc_submit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1592,16 +1592,21 @@ static void deregister_exec_queue(struct xe_guc *guc, struct xe_exec_queue *q)
xe_guc_ct_send_g2h_handler(&guc->ct, action, ARRAY_SIZE(action));
}

static void handle_sched_done(struct xe_guc *guc, struct xe_exec_queue *q)
static void handle_sched_done(struct xe_guc *guc, struct xe_exec_queue *q,
u32 runnable_state)
{
trace_xe_exec_queue_scheduling_done(q);

if (exec_queue_pending_enable(q)) {
xe_gt_assert(guc_to_gt(guc), runnable_state == 1);

q->guc->resume_time = ktime_get();
clear_exec_queue_pending_enable(q);
smp_wmb();
wake_up_all(&guc->ct.wq);
} else {
xe_gt_assert(guc_to_gt(guc), runnable_state == 0);

clear_exec_queue_pending_disable(q);
if (q->guc->suspend_pending) {
suspend_fence_signal(q);
Expand Down Expand Up @@ -1640,7 +1645,7 @@ int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len)
return -EPROTO;
}

handle_sched_done(guc, q);
handle_sched_done(guc, q, runnable_state);

return 0;
}
Expand Down

0 comments on commit 7f4f492

Please sign in to comment.