On Tue, Aug 05, 2014 at 07:51:14AM -0700, Rodrigo Vivi wrote:
> From: Chris Wilson <ch...@chris-wilson.co.uk>
>
> If we try to execute on a known ring, but it has failed to be
> initialised correctly, report that the GPU is hung rather than the
> command invalid. This leaves us reporting EINVAL only if the user
> requests execution on a ring that is not supported by the device.
>
> This should prevent UXA from getting stuck in a null render loop after a
> failed resume.
>
> v2 (Rodrigo): Fix conflict and add VCS2 ring and
> s/intel_ring_buffer/intel_engine_cs.
>
> Reported-by: Jiri Kosina <ji...@jikos.cz>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=76554
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
This isn't required any more, see
commit 074c6adaf4e7d1423d373bd5d1afc20b683cb4d0
Author: Chris Wilson <ch...@chris-wilson.co.uk>
Date: Wed Apr 9 09:19:43 2014 +0100
drm/i915: Mark device as wedged if we fail to resume
for the alternate merged patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 60998fc..288ff61 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1233,6 +1233,19 @@ eb_get_batch(struct eb_vmas *eb)
> return vma->obj;
> }
>
> +static bool
> +intel_ring_valid(struct intel_engine_cs *ring)
> +{
> + switch (ring->id) {
> + case RCS: return true;
> + case VCS: return HAS_BSD(ring->dev);
> + case BCS: return HAS_BLT(ring->dev);
> + case VECS: return HAS_VEBOX(ring->dev);
> + case VCS2: return HAS_BSD2(ring->dev);
> + default: return false;
> + }
> +}
> +
> static int
> i915_gem_do_execbuffer(struct drm_device *dev, void *data,
> struct drm_file *file,
> @@ -1289,7 +1302,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void
> *data,
> if (!intel_ring_initialized(ring)) {
> DRM_DEBUG("execbuf with invalid ring: %d\n",
> (int)(args->flags & I915_EXEC_RING_MASK));
> - return -EINVAL;
> + return intel_ring_valid(ring) ? -EIO : -EINVAL;
> }
>
> if (args->buffer_count < 1) {
> --
> 1.9.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
