projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39e7823
)
drm/i915: Mark the GPU as wedged without error on fault injection
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 7 Jun 2018 13:45:58 +0000
(14:45 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Fri, 8 Jun 2018 09:36:10 +0000
(10:36 +0100)
If we have been instructed (by CI) to inject a fault to load the module
with a wedged GPU, do so quietly less we upset CI.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Link:
https://patchwork.freedesktop.org/patch/msgid/20180607134558.31150-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index fd882eb389d222f5e934dd9918edcabe1a2624b6..4187e0688e508a8b335039db9c7d2b81520721b6 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem.c
+++ b/
drivers/gpu/drm/i915/i915_gem.c
@@
-5491,6
+5491,8
@@
int i915_gem_init(struct drm_i915_private *dev_priv)
}
if (i915_inject_load_failure()) {
+ DRM_DEBUG_DRIVER("Marking the driver as wedged\n");
+ i915_gem_set_wedged(dev_priv); /* Fail silently! */
ret = -EIO;
goto err_init_hw;
}