Commit 7f4f492c authored by Matthew Brost's avatar Matthew Brost

drm/xe: Assert runnable state in handle_sched_done

Ensure G2H and KMD GuC machine match.
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611144053.2805091-8-matthew.brost@intel.com
parent 41e1fa93
...@@ -1592,16 +1592,21 @@ static void deregister_exec_queue(struct xe_guc *guc, struct xe_exec_queue *q) ...@@ -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)); 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); trace_xe_exec_queue_scheduling_done(q);
if (exec_queue_pending_enable(q)) { if (exec_queue_pending_enable(q)) {
xe_gt_assert(guc_to_gt(guc), runnable_state == 1);
q->guc->resume_time = ktime_get(); q->guc->resume_time = ktime_get();
clear_exec_queue_pending_enable(q); clear_exec_queue_pending_enable(q);
smp_wmb(); smp_wmb();
wake_up_all(&guc->ct.wq); wake_up_all(&guc->ct.wq);
} else { } else {
xe_gt_assert(guc_to_gt(guc), runnable_state == 0);
clear_exec_queue_pending_disable(q); clear_exec_queue_pending_disable(q);
if (q->guc->suspend_pending) { if (q->guc->suspend_pending) {
suspend_fence_signal(q); suspend_fence_signal(q);
...@@ -1640,7 +1645,7 @@ int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len) ...@@ -1640,7 +1645,7 @@ int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len)
return -EPROTO; return -EPROTO;
} }
handle_sched_done(guc, q); handle_sched_done(guc, q, runnable_state);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment