diff options
| author | Eric Anholt | 2008-09-02 01:45:29 +0200 |
|---|---|---|
| committer | Dave Airlie | 2008-10-17 23:10:51 +0200 |
| commit | 546b0974c39657017407c86fe79811100b60700d (patch) | |
| tree | 42ae164d23ecaa1cb78ad87ad9603e0bdd29740d /drivers/gpu/drm/i915/i915_gem.c | |
| parent | i915: Add chip set ID param. (diff) | |
| download | kernel-qcow2-linux-546b0974c39657017407c86fe79811100b60700d.tar.gz kernel-qcow2-linux-546b0974c39657017407c86fe79811100b60700d.tar.xz kernel-qcow2-linux-546b0974c39657017407c86fe79811100b60700d.zip | |
i915: Use struct_mutex to protect ring in GEM mode.
In the conversion for GEM, we had stopped using the hardware lock to protect
ring usage, since it was all internal to the DRM now. However, some paths
weren't converted to using struct_mutex to prevent multiple threads from
concurrently working on the ring, in particular between the vblank swap handler
and ioctls.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 90ae8a0369f7..bb6e5a37efa2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2491,6 +2491,8 @@ i915_gem_load(struct drm_device *dev) INIT_LIST_HEAD(&dev_priv->mm.request_list); INIT_DELAYED_WORK(&dev_priv->mm.retire_work, i915_gem_retire_work_handler); + INIT_WORK(&dev_priv->mm.vblank_work, + i915_gem_vblank_work_handler); dev_priv->mm.next_gem_seqno = 1; i915_gem_detect_bit_6_swizzle(dev); |