projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dbc7e72
)
drm/i915/gt: Suppress the error message for GT init failure on error injection
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 3 Jun 2020 10:46:57 +0000
(11:46 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 3 Jun 2020 12:43:20 +0000
(13:43 +0100)
If we injected an error (such as pretending the GuC firmware was
broken), then suppress the error message as it is expected and our CI
complains if it sees any *ERROR*.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20200603104657.25651-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_gt_pm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 6bdb434a442d530edd4fb7afbe08187438cdb6e0..f1d5333f9456335191af534b7ea9c96ed40a45e3 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/
drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@
-214,8
+214,8
@@
int intel_gt_resume(struct intel_gt *gt)
/* Only when the HW is re-initialised, can we replay the requests */
err = intel_gt_init_hw(gt);
if (err) {
-
drm_err(>->i915->drm
,
- "Failed to initialize GPU, declaring it wedged!\n");
+
i915_probe_error(gt->i915
,
+
"Failed to initialize GPU, declaring it wedged!\n");
goto err_wedged;
}