Skip to content

Commit

Permalink
drm/i915: fix scheduling while holding the new active list spinlock
Browse files Browse the repository at this point in the history
regression caused by commit 5e118f4:
i915_gem_object_move_to_inactive() should be called in task context,
as it calls fput();

Signed-off-by: Shaohua Li<shaohua.li@intel.com>
[anholt: Add more detail to the comment about the lock break that's added]
Signed-off-by: Eric Anholt <eric@anholt.net>
  • Loading branch information
Shaohua Li authored and anholt committed Apr 14, 2009
1 parent 280b713 commit 68c8434
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1596,8 +1596,19 @@ i915_gem_retire_request(struct drm_device *dev,

if (obj->write_domain != 0)
i915_gem_object_move_to_flushing(obj);
else
else {
/* Take a reference on the object so it won't be
* freed while the spinlock is held. The list
* protection for this spinlock is safe when breaking
* the lock like this since the next thing we do
* is just get the head of the list again.
*/
drm_gem_object_reference(obj);
i915_gem_object_move_to_inactive(obj);
spin_unlock(&dev_priv->mm.active_list_lock);
drm_gem_object_unreference(obj);
spin_lock(&dev_priv->mm.active_list_lock);
}
}
out:
spin_unlock(&dev_priv->mm.active_list_lock);
Expand Down

0 comments on commit 68c8434

Please sign in to comment.