Commit fb2d2de3 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Matt Roper
Browse files

drm/i915/guc: Move and improve error message for missed CTB reply 



If we timeout waiting for a CT reply we print very simple error
message. Improve that and by moving error reporting to the caller
we can use CT_ERROR instead of DRM_ERROR and report just fence
as error code will be reported later anyway.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210926184545.1407-5-michal.wajdeczko@intel.com
parent 0e9deac5

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c

+4 −4
Original line number Diff line number Diff line
@@ -528,9 +528,6 @@ static int wait_for_ct_request_update(struct ct_request *req, u32 *status) 
		err = wait_for(done, GUC_CTB_RESPONSE_TIMEOUT_LONG_MS);

#undef done



	if (unlikely(err))

		DRM_ERROR("CT: fence %u err %d\n", req->fence, err);



	*status = req->status;

	return err;

}
@@ -728,8 +725,11 @@ static int ct_send(struct intel_guc_ct *ct, 


	err = wait_for_ct_request_update(&request, status);

	g2h_release_space(ct, GUC_CTB_HXG_MSG_MAX_LEN);

	if (unlikely(err))

	if (unlikely(err)) {

		CT_ERROR(ct, "No response for request %#x (fence %u)\n",

			 action[0], request.fence);

		goto unlink;

	}



	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, *status) != GUC_HXG_TYPE_RESPONSE_SUCCESS) {

		err = -EIO;