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: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210926184545.1407-5-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
index e03f86d3b0b95433fb3bd97e66dd522baa2b5729..0a3504bc0b61f119f52a891d4307390ed5810dd2 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -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 @@ retry:
 
        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;