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, Russell King <linux@armlinux.org.uk>
Subject: [PATCH v2 16/38] drm/armada: remove _unlocked suffix in drm_object_put_unlocked
Date: Fri, 15 May 2020 10:50:56 +0100 [thread overview]
Message-ID: <20200515095118.2743122-17-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: Russell King <linux@armlinux.org.uk>
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/armada/armada_crtc.c | 8 ++++----
drivers/gpu/drm/armada/armada_fb.c | 4 ++--
drivers/gpu/drm/armada/armada_fbdev.c | 6 +++---
drivers/gpu/drm/armada/armada_gem.c | 10 +++++-----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index c2b92acd1e9a..38dfaa46d306 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -710,13 +710,13 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
/* Must be a kernel-mapped object */
if (!obj->addr) {
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
return -EINVAL;
}
if (obj->obj.size < w * h * 4) {
DRM_ERROR("buffer is too small\n");
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
return -ENOMEM;
}
}
@@ -724,7 +724,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
if (dcrtc->cursor_obj) {
dcrtc->cursor_obj->update = NULL;
dcrtc->cursor_obj->update_data = NULL;
- drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
+ drm_gem_object_put(&dcrtc->cursor_obj->obj);
}
dcrtc->cursor_obj = obj;
dcrtc->cursor_w = w;
@@ -760,7 +760,7 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc)
struct armada_private *priv = crtc->dev->dev_private;
if (dcrtc->cursor_obj)
- drm_gem_object_put_unlocked(&dcrtc->cursor_obj->obj);
+ drm_gem_object_put(&dcrtc->cursor_obj->obj);
priv->dcrtc[dcrtc->num] = NULL;
drm_crtc_cleanup(&dcrtc->crtc);
diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
index 426ca383d696..b87c71703c85 100644
--- a/drivers/gpu/drm/armada/armada_fb.c
+++ b/drivers/gpu/drm/armada/armada_fb.c
@@ -129,12 +129,12 @@ struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
goto err;
}
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
return &dfb->fb;
err_unref:
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
err:
DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
return ERR_PTR(ret);
diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index f2dc371bd8e5..0c4601275507 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -51,13 +51,13 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
ret = armada_gem_linear_back(dev, obj);
if (ret) {
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
return ret;
}
ptr = armada_gem_map_object(dev, obj);
if (!ptr) {
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
return -ENOMEM;
}
@@ -67,7 +67,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh,
* A reference is now held by the framebuffer object if
* successful, otherwise this drops the ref for the error path.
*/
- drm_gem_object_put_unlocked(&obj->obj);
+ drm_gem_object_put(&obj->obj);
if (IS_ERR(dfb))
return PTR_ERR(dfb);
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index 976685f2939e..8005614d2e6b 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -256,7 +256,7 @@ int armada_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
/* drop reference from allocate - handle holds it now */
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
err:
- drm_gem_object_put_unlocked(&dobj->obj);
+ drm_gem_object_put(&dobj->obj);
return ret;
}
@@ -288,7 +288,7 @@ int armada_gem_create_ioctl(struct drm_device *dev, void *data,
/* drop reference from allocate - handle holds it now */
DRM_DEBUG_DRIVER("obj %p size %zu handle %#x\n", dobj, size, handle);
err:
- drm_gem_object_put_unlocked(&dobj->obj);
+ drm_gem_object_put(&dobj->obj);
return ret;
}
@@ -305,13 +305,13 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
return -ENOENT;
if (!dobj->obj.filp) {
- drm_gem_object_put_unlocked(&dobj->obj);
+ drm_gem_object_put(&dobj->obj);
return -EINVAL;
}
addr = vm_mmap(dobj->obj.filp, 0, args->size, PROT_READ | PROT_WRITE,
MAP_SHARED, args->offset);
- drm_gem_object_put_unlocked(&dobj->obj);
+ drm_gem_object_put(&dobj->obj);
if (IS_ERR_VALUE(addr))
return addr;
@@ -366,7 +366,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
}
unref:
- drm_gem_object_put_unlocked(&dobj->obj);
+ drm_gem_object_put(&dobj->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 ` Emil Velikov [this message]
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 ` [PATCH v2 19/38] drm/gma500: " Emil Velikov
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-17-emil.l.velikov@gmail.com \
--to=emil.l.velikov@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux@armlinux.org.uk \
/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).