| Message ID | 20180607134558.31150-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Chris Wilson (2018-06-07 14:45:58) > 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. s/less/lest/ -Chris
On Thu, Jun 07, 2018 at 02:45:58PM +0100, Chris Wilson wrote: > 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> -Michał > --- > drivers/gpu/drm/i915/i915_gem.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c > index fd882eb389d2..4187e0688e50 100644 > --- 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; > } > -- > 2.17.1 >
Quoting Michał Winiarski (2018-06-08 10:32:04) > On Thu, Jun 07, 2018 at 02:45:58PM +0100, Chris Wilson wrote: > > 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> Applied for peace and quiet, thanks. -Chris
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fd882eb389d2..4187e0688e50 100644 --- 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; }
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> --- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)