On Sat, 2009-04-18 at 10:43 +0800, Wu Fengguang wrote: > Signed-off-by: Wu Fengguang <[email protected]> > --- > drivers/gpu/drm/i915/i915_gem.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-)
Fixed up commit message and applied.
> --- mm.orig/drivers/gpu/drm/i915/i915_gem.c
> +++ mm/drivers/gpu/drm/i915/i915_gem.c
> @@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device
> dev_priv->mm.suspended = 0;
>
> ret = i915_gem_init_ringbuffer(dev);
> - if (ret != 0)
> + if (ret != 0) {
> + mutex_unlock(&dev->struct_mutex);
> return ret;
> + }
>
> spin_lock(&dev_priv->mm.active_list_lock);
> BUG_ON(!list_empty(&dev_priv->mm.active_list));
--
Eric Anholt
[email protected] [email protected]
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p
-- _______________________________________________ Dri-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/dri-devel
