[PATCH 1/3] drm/i915/huc: Use i915_probe_error to report probe injected errors

Thanneeru Srinivasulu thanneeru.srinivasulu at intel.com
Wed Oct 6 11:46:45 UTC 2021


Replace DRM_ERROR with i915_probe_error to report probe injected errors.

Signed-off-by: Thanneeru Srinivasulu <thanneeru.srinivasulu at intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 4 ++--
 drivers/gpu/drm/i915/gt/uc/intel_huc.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 0a3504bc0b61..83764db0fd6d 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
@@ -191,8 +191,8 @@ static int ct_register_buffer(struct intel_guc_ct *ct, u32 type,
 	err = guc_action_register_ct_buffer(ct_to_guc(ct), type,
 					    desc_addr, buff_addr, size);
 	if (unlikely(err))
-		CT_ERROR(ct, "Failed to register %s buffer (%pe)\n",
-			 guc_ct_buffer_type_to_str(type), ERR_PTR(err));
+		CT_PROBE_ERROR(ct, "Failed to register %s buffer (%pe)\n",
+			       guc_ct_buffer_type_to_str(type), ERR_PTR(err));
 	return err;
 }
 
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
index ff4b6869b80b..ff0f5b9130c9 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c
@@ -179,7 +179,7 @@ int intel_huc_auth(struct intel_huc *huc)
 	ret = intel_guc_auth_huc(guc,
 				 intel_guc_ggtt_offset(guc, huc->rsa_data));
 	if (ret) {
-		DRM_ERROR("HuC: GuC did not ack Auth request %d\n", ret);
+		i915_probe_error(gt->i915, "HuC: GuC did not ack Auth request %d\n", ret);
 		goto fail;
 	}
 
@@ -190,7 +190,7 @@ int intel_huc_auth(struct intel_huc *huc)
 					huc->status.value,
 					2, 50, NULL);
 	if (ret) {
-		DRM_ERROR("HuC: Firmware not verified %d\n", ret);
+		i915_probe_error(gt->i915, "HuC: Firmware not verified %d\n", ret);
 		goto fail;
 	}
 
-- 
2.25.1



More information about the Intel-gfx-trybot mailing list