On Mon, Dec 11, 2017 at 08:40:40PM +0000, Chris Wilson wrote:
> Since on gen2, we do not universally have a GPU reset implementation, we
> fail i915_reset() at intel_has_gpu_reset(). However, this is also
> intentionally disabled for CI testing and so it only has a debug
> message. Promote that debug message to a user-facing error message that
> should explain why their machine became unusable following the GPU hang.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> 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 5b1fd5f1defb..0c5355dbdf10 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1903,7 +1903,10 @@ void i915_reset(struct drm_i915_private *i915, unsigned int flags)
> }
>
> if (!intel_has_gpu_reset(i915)) {
> - DRM_DEBUG_DRIVER("GPU reset disabled\n");
> + if (i915_modparams.reset)
> + dev_err(i915->drm.dev, "GPU reset not supported\n");
> + else
> + DRM_DEBUG_DRIVER("GPU reset disabled\n");
> goto error;
> }
>
> --
> 2.15.1
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
