drm/i915: Add locking around framebuffer_references--
Subsystems (2)
PATCH 1/1 drm/i915: Add locking around framebuffer_references--
From: Ville Syrjälä <[email protected]>
obj->framebuffer_references isn't an atomic_t so the decrement needs to be protected by some lock. struct_mutex seems like the appropriate lock here, and we may already take it for the obj unref anyway.
Signed-off-by Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +4 -1
@@ -11504,11 +11504,14 @@ static void intel_setup_outputs(struct drm_device *dev)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) { +struct drm_device *dev = fb->dev;struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);drm_framebuffer_cleanup (fb); +mutex_lock (&dev->struct_mutex);WARN_ON (!intel_fb->obj->framebuffer_references--); -drm_gem_object_unreference_unlocked (&intel_fb->obj->base); +drm_gem_object_unreference (&intel_fb->obj->base); +mutex_unlock (&dev->struct_mutex);kfree (intel_fb); }
Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 7 lines · On Fri, Jun 13, 2014 at 11:10:53AM +0300, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
obj->framebuffer_referencesisn't anatomic_tso the decrement needs to be protected by some lock.struct_mutexseems like the appropriate lock here, and we may already take it for the obj unref anyway.Signed-off-by Ville Syrjälä <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 31 lines
--- drivers/gpu/drm/i915/intel_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +4
-1@@ -11504,11 +11504,14 @@ static void intel_setup_outputs(struct drm_device *dev)static void intel_user_framebuffer_destroy (struct drm_framebuffer *fb) { +struct drm_device *dev = fb->dev;struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);drm_framebuffer_cleanup (fb); +mutex_lock (&dev->struct_mutex);WARN_ON (!intel_fb->obj->framebuffer_references--); -drm_gem_object_unreference_unlocked (&intel_fb->obj->base); +drm_gem_object_unreference (&intel_fb->obj->base); +mutex_unlock (&dev->struct_mutex);kfree (intel_fb); }Signature · 6 lines
1.8.5.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch