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

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

drivers/gpu/drm/xe/xe_gt.c

+1 −3
Original line number Diff line number Diff line
@@ -658,9 +658,7 @@ static int gt_reset(struct xe_gt *gt) 
	xe_uc_stop_prepare(&gt->uc);

	xe_gt_pagefault_reset(gt);



	err = xe_uc_stop(&gt->uc);

	if (err)

		goto err_out;

	xe_uc_stop(&gt->uc);



	xe_gt_tlb_invalidation_reset(gt);

drivers/gpu/drm/xe/xe_guc.c

+2 −8
Original line number Diff line number Diff line
@@ -885,17 +885,11 @@ void xe_guc_stop_prepare(struct xe_guc *guc) 
	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);



	ret = xe_guc_submit_stop(guc);

	if (ret)

		return ret;



	return 0;

	xe_guc_submit_stop(guc);

}



int xe_guc_start(struct xe_guc *guc)

drivers/gpu/drm/xe/xe_guc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

void xe_guc_reset_wait(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);

bool xe_guc_in_reset(struct xe_guc *guc);

drivers/gpu/drm/xe/xe_guc_submit.c

+1 −2
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ void xe_guc_submit_reset_wait(struct xe_guc *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;

	unsigned long index;
@@ -1539,7 +1539,6 @@ int xe_guc_submit_stop(struct xe_guc *guc) 
	 * creation which is protected by guc->submission_state.lock.

	 */



	return 0;

}



static void guc_exec_queue_start(struct xe_exec_queue *q)

drivers/gpu/drm/xe/xe_guc_submit.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ int xe_guc_submit_init(struct xe_guc *guc); 


int xe_guc_submit_reset_prepare(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_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len);