From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked
Date: Tue, 7 Apr 2015 17:19:46 +0300 [thread overview]
Message-ID: <20150407141946.GL17410@intel.com> (raw)
In-Reply-To: <5523E1F7.8070909@linux.intel.com>
On Tue, Apr 07, 2015 at 03:56:07PM +0200, Maarten Lankhorst wrote:
> If kref_put_mutex returns true then the caller or the put function is responsible
> for unlocking the mutex.
This patch introduces the kref_put_mutex() usage, so this commit
message is rather confusing.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index 1e6ae1458f7a..7a592d7e398b 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -149,14 +149,16 @@ drm_gem_object_unreference(struct drm_gem_object *obj)
> static inline void
> drm_gem_object_unreference_unlocked(struct drm_gem_object *obj)
> {
> - if (obj && !atomic_add_unless(&obj->refcount.refcount, -1, 1)) {
> - struct drm_device *dev = obj->dev;
> + struct drm_device *dev;
> +
> + if (!obj)
> + return;
>
> - mutex_lock(&dev->struct_mutex);
> - if (likely(atomic_dec_and_test(&obj->refcount.refcount)))
> - drm_gem_object_free(&obj->refcount);
> + dev = obj->dev;
> + if (kref_put_mutex(&obj->refcount, drm_gem_object_free, &dev->struct_mutex))
> mutex_unlock(&dev->struct_mutex);
> - }
> + else
> + might_lock(&dev->struct_mutex);
> }
>
> int drm_gem_handle_create(struct drm_file *file_priv,
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-04-07 14:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-07 13:56 [PATCH] drm: Use kref_put_mutex in drm_gem_object_unreference_unlocked Maarten Lankhorst
2015-04-07 14:19 ` Ville Syrjälä [this message]
2015-04-07 14:23 ` Maarten Lankhorst
2015-04-07 15:15 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150407141946.GL17410@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.