leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Unref old_obj on get_fence_reg() error path

Browse Source 
Remember to release the local reference if we fail to wait on
the rendering.

(Also whilst in the vicinity add some whitespace so that the phasing of
the operations is clearer.)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chris Wilson 2009-09-01 12:02:39 +01:00 committed by Eric Anholt
parent bcc24fb425
commit 58c2fb647a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/i915/i915_gem.c
View File

@ -2267,8 +2267,6 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj)
fence_list) { fence_list) {
old_obj = old_obj_priv->obj; old_obj = old_obj_priv->obj;
reg = &dev_priv->fence_regs[old_obj_priv->fence_reg];
if (old_obj_priv->pin_count) if (old_obj_priv->pin_count)
continue; continue;
@ -2290,8 +2288,11 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj)
*/ */
i915_gem_object_flush_gpu_write_domain(old_obj); i915_gem_object_flush_gpu_write_domain(old_obj);
ret = i915_gem_object_wait_rendering(old_obj); ret = i915_gem_object_wait_rendering(old_obj);
if (ret != 0) if (ret != 0) {
drm_gem_object_unreference(old_obj);
return ret; return ret;
}
break; break;
} }
@ -2299,10 +2300,14 @@ i915_gem_object_get_fence_reg(struct drm_gem_object *obj)
* Zap this virtual mapping so we can set up a fence again * Zap this virtual mapping so we can set up a fence again
* for this object next time we need it. * for this object next time we need it.
*/ */
i915_gem_release_mmap(reg->obj); i915_gem_release_mmap(old_obj);
i = old_obj_priv->fence_reg; i = old_obj_priv->fence_reg;
reg = &dev_priv->fence_regs[i];
old_obj_priv->fence_reg = I915_FENCE_REG_NONE; old_obj_priv->fence_reg = I915_FENCE_REG_NONE;
list_del_init(&old_obj_priv->fence_list); list_del_init(&old_obj_priv->fence_list);
drm_gem_object_unreference(old_obj); drm_gem_object_unreference(old_obj);
} }