diff options
| author | Daniel Vetter | 2013-07-24 22:40:23 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-07-25 15:30:54 +0200 |
| commit | c20e835586c0e4d08f891362b3c829d45ef45f9d (patch) | |
| tree | 991c9c15408fa756f26ab3aec5d2b6fb38384f74 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Convert the register access tracepoint to be conditional (diff) | |
| download | kernel-qcow2-linux-c20e835586c0e4d08f891362b3c829d45ef45f9d.tar.gz kernel-qcow2-linux-c20e835586c0e4d08f891362b3c829d45ef45f9d.tar.xz kernel-qcow2-linux-c20e835586c0e4d08f891362b3c829d45ef45f9d.zip | |
drm/i915: fix the racy object accounting
Just use a spinlock to protect them.
v2: Rebase onto the new object create refcount fix patch.
v3: Don't kill dev_priv->mm.object_memory as requested by Chris and
hence just use a spinlock instead of atomic_t.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67287
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index eceab96d76f5..35d17fb1b89b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -75,15 +75,19 @@ static inline void i915_gem_object_fence_lost(struct drm_i915_gem_object *obj) static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv, size_t size) { + spin_lock(&dev_priv->mm.object_stat_lock); dev_priv->mm.object_count++; dev_priv->mm.object_memory += size; + spin_unlock(&dev_priv->mm.object_stat_lock); } static void i915_gem_info_remove_obj(struct drm_i915_private *dev_priv, size_t size) { + spin_lock(&dev_priv->mm.object_stat_lock); dev_priv->mm.object_count--; dev_priv->mm.object_memory -= size; + spin_unlock(&dev_priv->mm.object_stat_lock); } static int |