| Message ID | 1449833608-22125-11-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 11, 2015 at 11:33:06AM +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> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> lgtm. Are there now changes to gem_eio needed to adjust/improve test coverage still? I lost a bit track on this part ... I'll leave later patches to Mika&Tvrtko for detailed reviewing. -Daniel > --- > 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 8bdc51bc00a4..ba91f65b6082 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -895,7 +895,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.3 >
On Wed, Dec 16, 2015 at 10:53:16AM +0100, Daniel Vetter wrote: > On Fri, Dec 11, 2015 at 11:33:06AM +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> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > lgtm. Are there now changes to gem_eio needed to adjust/improve test > coverage still? I lost a bit track on this part ... The only remaining task for gem_eio (aside from adding more negative tests) is to cement that wait-ioctl doesn't return EIO if it is wedged previously or if a hang occurs during the wait. -Chris
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8bdc51bc00a4..ba91f65b6082 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -895,7 +895,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; }