From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Print an error message for a reset failure on gen2
Date: Tue, 12 Dec 2017 08:35:31 +0200 [thread overview]
Message-ID: <20171212063531.GS10981@intel.com> (raw)
In-Reply-To: <20171211204040.22858-1-chris@chris-wilson.co.uk>
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@chris-wilson.co.uk>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-12-12 6:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-11 20:40 [PATCH] drm/i915: Print an error message for a reset failure on gen2 Chris Wilson
2017-12-12 5:39 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-12-12 6:35 ` Ville Syrjälä [this message]
2017-12-12 11:11 ` [PATCH] " Chris Wilson
2017-12-12 7:01 ` ✓ Fi.CI.IGT: success for " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171212063531.GS10981@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.