From: Emil Velikov <emil.l.velikov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: David Airlie <airlied@linux.ie>, emil.l.velikov@gmail.com
Subject: [PATCH v2 19/38] drm/gma500: remove _unlocked suffix in drm_object_put_unlocked
Date: Fri, 15 May 2020 10:50:59 +0100 [thread overview]
Message-ID: <20200515095118.2743122-20-emil.l.velikov@gmail.com> (raw)
In-Reply-To: <20200515095118.2743122-1-emil.l.velikov@gmail.com>
From: Emil Velikov <emil.velikov@collabora.com>
Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.
Just drop the suffix. It makes the API cleaner.
Done via the following script:
__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
sed -i "s/$__from/$__to/g" $__file;
done
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
drivers/gpu/drm/gma500/framebuffer.c | 2 +-
drivers/gpu/drm/gma500/gem.c | 2 +-
drivers/gpu/drm/gma500/gma_display.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 23a78d755382..da02d7e8a8f5 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -491,7 +491,7 @@ static int psb_fbdev_destroy(struct drm_device *dev,
drm_framebuffer_cleanup(fb);
if (fb->obj[0])
- drm_gem_object_put_unlocked(fb->obj[0]);
+ drm_gem_object_put(fb->obj[0]);
kfree(fb);
return 0;
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 83ee86f70b89..f9c4b1d76f56 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -82,7 +82,7 @@ int psb_gem_create(struct drm_file *file, struct drm_device *dev, u64 size,
return ret;
}
/* We have the initial and handle reference but need only one now */
- drm_gem_object_put_unlocked(&r->gem);
+ drm_gem_object_put(&r->gem);
*handlep = handle;
return 0;
}
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 17f136985d21..3df6d6e850f5 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -351,7 +351,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
gt = container_of(gma_crtc->cursor_obj,
struct gtt_range, gem);
psb_gtt_unpin(gt);
- drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
+ drm_gem_object_put(gma_crtc->cursor_obj);
gma_crtc->cursor_obj = NULL;
}
return 0;
@@ -427,7 +427,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
if (gma_crtc->cursor_obj) {
gt = container_of(gma_crtc->cursor_obj, struct gtt_range, gem);
psb_gtt_unpin(gt);
- drm_gem_object_put_unlocked(gma_crtc->cursor_obj);
+ drm_gem_object_put(gma_crtc->cursor_obj);
}
gma_crtc->cursor_obj = obj;
@@ -435,7 +435,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
return ret;
unref_cursor:
- drm_gem_object_put_unlocked(obj);
+ drm_gem_object_put(obj);
return ret;
}
--
2.25.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-15 9:54 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 9:50 [PATCH v2 00/38] Fareless gem_free_object Emil Velikov
2020-05-15 9:50 ` [PATCH v2 01/38] drm: remove unused drm_gem.h include Emil Velikov
2020-05-15 9:50 ` [PATCH v2 02/38] drm/gem: use _unlocked reference in drm_gem_objects_lookup docs Emil Velikov
2020-05-15 9:50 ` [PATCH v2 03/38] drm/todo: mention i915 in the struct_mutex section Emil Velikov
2020-05-15 9:50 ` [PATCH v2 04/38] drm/doc: drop struct_mutex references Emil Velikov
2020-05-15 9:50 ` [PATCH v2 05/38] drm/doc: add WARNING for drm_device::struct_mutex Emil Velikov
2020-05-15 9:50 ` [PATCH v2 06/38] drm/doc: drop struct_mutex reference for drm_gem_object_free Emil Velikov
2020-05-15 9:50 ` [PATCH v2 07/38] drm/amdgpu: use the unlocked drm_gem_object_put Emil Velikov
2020-05-15 9:50 ` [PATCH v2 08/38] drm/gma500: Use lockless gem BO free callback Emil Velikov
2020-05-15 9:50 ` [PATCH v2 09/38] drm: remove drm_driver::gem_free_object Emil Velikov
2020-05-15 14:22 ` Daniel Vetter
2020-05-15 9:50 ` [PATCH v2 10/38] drm/gem: fold drm_gem_object_put_unlocked and __drm_gem_object_put() Emil Velikov
2020-05-15 14:24 ` Daniel Vetter
2020-05-15 9:50 ` [PATCH v2 11/38] drm/gem: add _locked suffix to drm_object_put Emil Velikov
2020-05-15 12:24 ` Thomas Zimmermann
2020-05-15 12:46 ` Steven Price
2020-05-15 9:50 ` [PATCH v2 12/38] drm/gem: add drm_object_put helper Emil Velikov
2020-05-15 15:14 ` Steven Price
2020-05-15 9:50 ` [PATCH v2 13/38] drm: remove _unlocked suffix in drm_object_put_unlocked Emil Velikov
2020-05-15 12:46 ` Steven Price
2020-05-15 9:50 ` [PATCH v2 14/38] drm/amd: " Emil Velikov
2020-05-15 9:50 ` [PATCH v2 15/38] drm/arm: " Emil Velikov
2020-05-15 9:50 ` [PATCH v2 16/38] drm/armada: " Emil Velikov
2020-05-15 9:50 ` [PATCH v2 17/38] drm/etnaviv: " Emil Velikov
2020-05-15 9:50 ` [PATCH v2 18/38] drm/exynos: " Emil Velikov
2020-05-15 9:50 ` Emil Velikov [this message]
2020-05-15 9:51 ` [PATCH v2 20/38] drm/i915: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 21/38] drm/lima: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 22/38] drm/mediatek: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 23/38] drm/mgag200: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 24/38] drm/msm: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 25/38] drm/nouveau: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 26/38] drm/omapdrm: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 27/38] drm/panfrost: " Emil Velikov
2020-05-15 12:46 ` Steven Price
2020-05-15 9:51 ` [PATCH v2 28/38] drm/qxl: " Emil Velikov
2020-05-15 10:14 ` Gerd Hoffmann
2020-05-15 9:51 ` [PATCH v2 29/38] drm/radeon: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 30/38] drm/rockchip: " Emil Velikov
2020-05-15 10:23 ` Heiko Stübner
2020-05-15 9:51 ` [PATCH v2 31/38] drm/tegra: " Emil Velikov
2020-05-15 11:52 ` Thierry Reding
2020-05-15 9:51 ` [PATCH v2 32/38] drm/v3d: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 33/38] drm/vc4: " Emil Velikov
2020-05-15 9:51 ` [PATCH v2 34/38] drm/vgem: " Emil Velikov
2020-05-15 14:26 ` Daniel Vetter
2020-05-15 9:51 ` [PATCH v2 35/38] drm/virtio: " Emil Velikov
2020-05-15 10:14 ` Gerd Hoffmann
2020-05-15 9:51 ` [PATCH v2 36/38] drm/vkms: " Emil Velikov
2020-05-15 14:26 ` Daniel Vetter
2020-05-15 9:51 ` [PATCH v2 37/38] drm/xen: " Emil Velikov
2020-05-15 10:12 ` Oleksandr Andrushchenko
2020-05-15 9:51 ` [PATCH v2 38/38] drm: remove transient drm_object_put_unlocked() Emil Velikov
2020-05-15 12:27 ` [PATCH v2 00/38] Fareless gem_free_object Thomas Zimmermann
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=20200515095118.2743122-20-emil.l.velikov@gmail.com \
--to=emil.l.velikov@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).