Skip to content

Commit 4d938bb

Browse files
committed
drm/i915/huc: silence injected failure in the load via GSC path
If we can't load the HuC due to an injected failure, we don't want to throw and error and trip CI. Using the gt_probe_error macro for logging ensure that the error is only printed if it wasn't explicitly injected. v2: keep the line to less than 100 characters (checkpatch). Link: https://gitlab.freedesktop.org/drm/intel/-/issues/7061 Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> #v1 Reviewed-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230816231320.1555190-1-daniele.ceraolospurio@intel.com
1 parent 4485bd5 commit 4d938bb

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/gpu/drm/i915/pxp/intel_pxp_tee.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <drm/i915_component.h>
1010

1111
#include "gem/i915_gem_lmem.h"
12+
#include "gt/intel_gt_print.h"
1213

1314
#include "i915_drv.h"
1415
#include "gt/intel_gt.h"
@@ -155,7 +156,8 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
155156
{
156157
struct drm_i915_private *i915 = kdev_to_i915(i915_kdev);
157158
struct intel_pxp *pxp = i915->pxp;
158-
struct intel_uc *uc = &pxp->ctrl_gt->uc;
159+
struct intel_gt *gt = pxp->ctrl_gt;
160+
struct intel_uc *uc = &gt->uc;
159161
intel_wakeref_t wakeref;
160162
int ret = 0;
161163

@@ -175,7 +177,7 @@ static int i915_pxp_tee_component_bind(struct device *i915_kdev,
175177
/* load huc via pxp */
176178
ret = intel_huc_fw_load_and_auth_via_gsc(&uc->huc);
177179
if (ret < 0)
178-
drm_err(&i915->drm, "failed to load huc via gsc %d\n", ret);
180+
gt_probe_error(gt, "failed to load huc via gsc %d\n", ret);
179181
}
180182
}
181183

0 commit comments

Comments
 (0)