On Wed, Aug 06, 2014 at 09:56:45AM +0200, Daniel Vetter wrote: > On Tue, Aug 05, 2014 at 07:51:14AM -0700, Rodrigo Vivi wrote: > > From: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > > > 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 <jikos@xxxxxxxx> > > References: https://bugs.freedesktop.org/show_bug.cgi?id=76554 > > Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > > This isn't required any more, see > > commit 074c6adaf4e7d1423d373bd5d1afc20b683cb4d0 > Author: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > 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. Hmm, there is still a path that ends here, but the example above is already fixed as you say. -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
