Commit c832541c authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Matthew Brost

drm/xe: Change xe_guc_submit_stop return to void

The function xe_guc_submit_stop consistently returns 0 without an error
state, prompting the caller to verify it, which is redundant.

Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240424041911.2184868-1-himal.prasad.ghimiray@intel.com
parent c79828e0
...@@ -658,9 +658,7 @@ static int gt_reset(struct xe_gt *gt) ...@@ -658,9 +658,7 @@ static int gt_reset(struct xe_gt *gt)
xe_uc_stop_prepare(&gt->uc); xe_uc_stop_prepare(&gt->uc);
xe_gt_pagefault_reset(gt); xe_gt_pagefault_reset(gt);
err = xe_uc_stop(&gt->uc); xe_uc_stop(&gt->uc);
if (err)
goto err_out;
xe_gt_tlb_invalidation_reset(gt); xe_gt_tlb_invalidation_reset(gt);
......
...@@ -885,17 +885,11 @@ void xe_guc_stop_prepare(struct xe_guc *guc) ...@@ -885,17 +885,11 @@ void xe_guc_stop_prepare(struct xe_guc *guc)
XE_WARN_ON(xe_guc_pc_stop(&guc->pc)); XE_WARN_ON(xe_guc_pc_stop(&guc->pc));
} }
int xe_guc_stop(struct xe_guc *guc) void xe_guc_stop(struct xe_guc *guc)
{ {
int ret;
xe_guc_ct_stop(&guc->ct); xe_guc_ct_stop(&guc->ct);
ret = xe_guc_submit_stop(guc); xe_guc_submit_stop(guc);
if (ret)
return ret;
return 0;
} }
int xe_guc_start(struct xe_guc *guc) int xe_guc_start(struct xe_guc *guc)
......
...@@ -35,7 +35,7 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p); ...@@ -35,7 +35,7 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p);
int xe_guc_reset_prepare(struct xe_guc *guc); int xe_guc_reset_prepare(struct xe_guc *guc);
void xe_guc_reset_wait(struct xe_guc *guc); void xe_guc_reset_wait(struct xe_guc *guc);
void xe_guc_stop_prepare(struct xe_guc *guc); void xe_guc_stop_prepare(struct xe_guc *guc);
int xe_guc_stop(struct xe_guc *guc); void xe_guc_stop(struct xe_guc *guc);
int xe_guc_start(struct xe_guc *guc); int xe_guc_start(struct xe_guc *guc);
bool xe_guc_in_reset(struct xe_guc *guc); bool xe_guc_in_reset(struct xe_guc *guc);
......
...@@ -1519,7 +1519,7 @@ void xe_guc_submit_reset_wait(struct xe_guc *guc) ...@@ -1519,7 +1519,7 @@ void xe_guc_submit_reset_wait(struct xe_guc *guc)
wait_event(guc->ct.wq, !guc_read_stopped(guc)); wait_event(guc->ct.wq, !guc_read_stopped(guc));
} }
int xe_guc_submit_stop(struct xe_guc *guc) void xe_guc_submit_stop(struct xe_guc *guc)
{ {
struct xe_exec_queue *q; struct xe_exec_queue *q;
unsigned long index; unsigned long index;
...@@ -1539,7 +1539,6 @@ int xe_guc_submit_stop(struct xe_guc *guc) ...@@ -1539,7 +1539,6 @@ int xe_guc_submit_stop(struct xe_guc *guc)
* creation which is protected by guc->submission_state.lock. * creation which is protected by guc->submission_state.lock.
*/ */
return 0;
} }
static void guc_exec_queue_start(struct xe_exec_queue *q) static void guc_exec_queue_start(struct xe_exec_queue *q)
......
...@@ -16,7 +16,7 @@ int xe_guc_submit_init(struct xe_guc *guc); ...@@ -16,7 +16,7 @@ int xe_guc_submit_init(struct xe_guc *guc);
int xe_guc_submit_reset_prepare(struct xe_guc *guc); int xe_guc_submit_reset_prepare(struct xe_guc *guc);
void xe_guc_submit_reset_wait(struct xe_guc *guc); void xe_guc_submit_reset_wait(struct xe_guc *guc);
int xe_guc_submit_stop(struct xe_guc *guc); void xe_guc_submit_stop(struct xe_guc *guc);
int xe_guc_submit_start(struct xe_guc *guc); int xe_guc_submit_start(struct xe_guc *guc);
int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len); int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len);
......
...@@ -215,13 +215,13 @@ void xe_uc_stop_prepare(struct xe_uc *uc) ...@@ -215,13 +215,13 @@ void xe_uc_stop_prepare(struct xe_uc *uc)
xe_guc_stop_prepare(&uc->guc); xe_guc_stop_prepare(&uc->guc);
} }
int xe_uc_stop(struct xe_uc *uc) void xe_uc_stop(struct xe_uc *uc)
{ {
/* GuC submission not enabled, nothing to do */ /* GuC submission not enabled, nothing to do */
if (!xe_device_uc_enabled(uc_to_xe(uc))) if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0; return;
return xe_guc_stop(&uc->guc); xe_guc_stop(&uc->guc);
} }
int xe_uc_start(struct xe_uc *uc) int xe_uc_start(struct xe_uc *uc)
...@@ -247,17 +247,13 @@ static void uc_reset_wait(struct xe_uc *uc) ...@@ -247,17 +247,13 @@ static void uc_reset_wait(struct xe_uc *uc)
int xe_uc_suspend(struct xe_uc *uc) int xe_uc_suspend(struct xe_uc *uc)
{ {
int ret;
/* GuC submission not enabled, nothing to do */ /* GuC submission not enabled, nothing to do */
if (!xe_device_uc_enabled(uc_to_xe(uc))) if (!xe_device_uc_enabled(uc_to_xe(uc)))
return 0; return 0;
uc_reset_wait(uc); uc_reset_wait(uc);
ret = xe_uc_stop(uc); xe_uc_stop(uc);
if (ret)
return ret;
return xe_guc_suspend(&uc->guc); return xe_guc_suspend(&uc->guc);
} }
......
...@@ -16,7 +16,7 @@ int xe_uc_fini_hw(struct xe_uc *uc); ...@@ -16,7 +16,7 @@ int xe_uc_fini_hw(struct xe_uc *uc);
void xe_uc_gucrc_disable(struct xe_uc *uc); void xe_uc_gucrc_disable(struct xe_uc *uc);
int xe_uc_reset_prepare(struct xe_uc *uc); int xe_uc_reset_prepare(struct xe_uc *uc);
void xe_uc_stop_prepare(struct xe_uc *uc); void xe_uc_stop_prepare(struct xe_uc *uc);
int xe_uc_stop(struct xe_uc *uc); void xe_uc_stop(struct xe_uc *uc);
int xe_uc_start(struct xe_uc *uc); int xe_uc_start(struct xe_uc *uc);
int xe_uc_suspend(struct xe_uc *uc); int xe_uc_suspend(struct xe_uc *uc);
int xe_uc_sanitize_reset(struct xe_uc *uc); int xe_uc_sanitize_reset(struct xe_uc *uc);
......
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