On Fri, Feb 08, 2013 at 11:49:24AM -0800, Ben Widawsky wrote: > The ring initialization will differ a bit in upcoming generations, and > this split will prepare the code for what's needed. > > This patch also fixes a bug introduced in: > commit 99433931950f33039d9e1a52b4ed9af3f1b58e84 > Author: Mika Kuoppala <mika.kuoppala at linux.intel.com> > Date: Tue Jan 22 14:12:17 2013 +0200 > > drm/i915: use gem_set_seqno() on hardware init > > After doing the extraction, the bad error handling became obvious. I > acknowledge that this should be two patches, but it's a pretty > small/trivial patch. If requested, I can certainly do the fix as a > distinct patch. > > v2: Should be cleanup blt, not init blt on failure (Chris) > > v3: Forgot to git add on v2 > > Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com> > Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> > Signed-off-by: Ben Widawsky <ben at bwidawsk.net> Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch