| Message ID | 1448786893-2522-6-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Nov 29, 2015 at 08:48:03AM +0000, Chris Wilson wrote: > If we do not have lowlevel support for reseting the GPU, or if the user > has explicitly disabled reseting the device, the failure is expected. > Since it is an expected failure, we should be using a lower priority > message than *ERROR*, perhaps NOTICE. In the absence of DRM_NOTICE, just > emit the expected failure as a DEBUG message. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Works for me too. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/i915_drv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index eb893a5e00b1..476bb696dbcb 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -959,7 +959,10 @@ int i915_reset(struct drm_device *dev) > pr_notice("drm/i915: Resetting chip after gpu hang\n"); > > if (ret) { > - DRM_ERROR("Failed to reset chip: %i\n", ret); > + if (ret != -ENODEV) > + DRM_ERROR("Failed to reset chip: %i\n", ret); > + else > + DRM_DEBUG_DRIVER("GPU reset disabled\n"); > goto error; > } > > -- > 2.6.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index eb893a5e00b1..476bb696dbcb 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -959,7 +959,10 @@ int i915_reset(struct drm_device *dev) pr_notice("drm/i915: Resetting chip after gpu hang\n"); if (ret) { - DRM_ERROR("Failed to reset chip: %i\n", ret); + if (ret != -ENODEV) + DRM_ERROR("Failed to reset chip: %i\n", ret); + else + DRM_DEBUG_DRIVER("GPU reset disabled\n"); goto error; }
If we do not have lowlevel support for reseting the GPU, or if the user has explicitly disabled reseting the device, the failure is expected. Since it is an expected failure, we should be using a lower priority message than *ERROR*, perhaps NOTICE. In the absence of DRM_NOTICE, just emit the expected failure as a DEBUG message. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)