mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Cihangir Akturk <cakturk@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: daniel@ffwll.ch, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	Cihangir Akturk <cakturk@gmail.com>,
	Eric Anholt <eric@anholt.net>, David Airlie <airlied@linux.ie>
Subject: [PATCH v2 25/29] drm/vc4: switch to drm_*_get(), drm_*_put() helpers
Date: Thu, 10 Aug 2017 15:10:08 +0300	[thread overview]
Message-ID: <1502367012-9417-26-git-send-email-cakturk@gmail.com> (raw)
In-Reply-To: <1502367012-9417-1-git-send-email-cakturk@gmail.com>

Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference()
and drm_*_unreference() helpers.

drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() and should not be
used by new code. So convert all users of compatibility functions to
use the new APIs.

Generated by: scripts/coccinelle/api/drm-get-put.cocci

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
---
 drivers/gpu/drm/vc4/vc4_bo.c   | 12 ++++++------
 drivers/gpu/drm/vc4/vc4_crtc.c |  6 +++---
 drivers/gpu/drm/vc4/vc4_gem.c  | 14 +++++++-------
 drivers/gpu/drm/vc4/vc4_kms.c  |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index 487f964..ee10152 100644
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -273,7 +273,7 @@ int vc4_dumb_create(struct drm_file *file_priv,
 		return PTR_ERR(bo);
 
 	ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
-	drm_gem_object_unreference_unlocked(&bo->base.base);
+	drm_gem_object_put_unlocked(&bo->base.base);
 
 	return ret;
 }
@@ -488,7 +488,7 @@ int vc4_create_bo_ioctl(struct drm_device *dev, void *data,
 		return PTR_ERR(bo);
 
 	ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
-	drm_gem_object_unreference_unlocked(&bo->base.base);
+	drm_gem_object_put_unlocked(&bo->base.base);
 
 	return ret;
 }
@@ -508,7 +508,7 @@ int vc4_mmap_bo_ioctl(struct drm_device *dev, void *data,
 	/* The mmap offset was set up at BO allocation time. */
 	args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
 
-	drm_gem_object_unreference_unlocked(gem_obj);
+	drm_gem_object_put_unlocked(gem_obj);
 	return 0;
 }
 
@@ -564,7 +564,7 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data,
 	ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
 
  fail:
-	drm_gem_object_unreference_unlocked(&bo->base.base);
+	drm_gem_object_put_unlocked(&bo->base.base);
 
 	return ret;
 }
@@ -611,7 +611,7 @@ int vc4_set_tiling_ioctl(struct drm_device *dev, void *data,
 	bo = to_vc4_bo(gem_obj);
 	bo->t_format = t_format;
 
-	drm_gem_object_unreference_unlocked(gem_obj);
+	drm_gem_object_put_unlocked(gem_obj);
 
 	return 0;
 }
@@ -646,7 +646,7 @@ int vc4_get_tiling_ioctl(struct drm_device *dev, void *data,
 	else
 		args->modifier = DRM_FORMAT_MOD_NONE;
 
-	drm_gem_object_unreference_unlocked(gem_obj);
+	drm_gem_object_put_unlocked(gem_obj);
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index a12cc7e..41fa025 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -757,7 +757,7 @@ vc4_async_page_flip_complete(struct vc4_seqno_cb *cb)
 	}
 
 	drm_crtc_vblank_put(crtc);
-	drm_framebuffer_unreference(flip_state->fb);
+	drm_framebuffer_put(flip_state->fb);
 	kfree(flip_state);
 
 	up(&vc4->async_modeset);
@@ -786,7 +786,7 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
 	if (!flip_state)
 		return -ENOMEM;
 
-	drm_framebuffer_reference(fb);
+	drm_framebuffer_get(fb);
 	flip_state->fb = fb;
 	flip_state->crtc = crtc;
 	flip_state->event = event;
@@ -794,7 +794,7 @@ static int vc4_async_page_flip(struct drm_crtc *crtc,
 	/* Make sure all other async modesetes have landed. */
 	ret = down_interruptible(&vc4->async_modeset);
 	if (ret) {
-		drm_framebuffer_unreference(fb);
+		drm_framebuffer_put(fb);
 		kfree(flip_state);
 		return ret;
 	}
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index d5b821a..2ffe0d0 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -55,7 +55,7 @@ vc4_free_hang_state(struct drm_device *dev, struct vc4_hang_state *state)
 	unsigned int i;
 
 	for (i = 0; i < state->user_state.bo_count; i++)
-		drm_gem_object_unreference_unlocked(state->bo[i]);
+		drm_gem_object_put_unlocked(state->bo[i]);
 
 	kfree(state);
 }
@@ -188,12 +188,12 @@ vc4_save_hang_state(struct drm_device *dev)
 			continue;
 
 		for (j = 0; j < exec[i]->bo_count; j++) {
-			drm_gem_object_reference(&exec[i]->bo[j]->base);
+			drm_gem_object_get(&exec[i]->bo[j]->base);
 			kernel_state->bo[j + prev_idx] = &exec[i]->bo[j]->base;
 		}
 
 		list_for_each_entry(bo, &exec[i]->unref_list, unref_head) {
-			drm_gem_object_reference(&bo->base.base);
+			drm_gem_object_get(&bo->base.base);
 			kernel_state->bo[j + prev_idx] = &bo->base.base;
 			j++;
 		}
@@ -697,7 +697,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
 			spin_unlock(&file_priv->table_lock);
 			goto fail;
 		}
-		drm_gem_object_reference(bo);
+		drm_gem_object_get(bo);
 		exec->bo[i] = (struct drm_gem_cma_object *)bo;
 	}
 	spin_unlock(&file_priv->table_lock);
@@ -835,7 +835,7 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
 
 	if (exec->bo) {
 		for (i = 0; i < exec->bo_count; i++)
-			drm_gem_object_unreference_unlocked(&exec->bo[i]->base);
+			drm_gem_object_put_unlocked(&exec->bo[i]->base);
 		kvfree(exec->bo);
 	}
 
@@ -843,7 +843,7 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
 		struct vc4_bo *bo = list_first_entry(&exec->unref_list,
 						     struct vc4_bo, unref_head);
 		list_del(&bo->unref_head);
-		drm_gem_object_unreference_unlocked(&bo->base.base);
+		drm_gem_object_put_unlocked(&bo->base.base);
 	}
 
 	/* Free up the allocation of any bin slots we used. */
@@ -982,7 +982,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev, void *data,
 	ret = vc4_wait_for_seqno_ioctl_helper(dev, bo->seqno,
 					      &args->timeout_ns);
 
-	drm_gem_object_unreference_unlocked(gem_obj);
+	drm_gem_object_put_unlocked(gem_obj);
 	return ret;
 }
 
diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index bc6ecdc..31d8280 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -219,7 +219,7 @@ static struct drm_framebuffer *vc4_fb_create(struct drm_device *dev,
 			mode_cmd_local.modifier[0] = DRM_FORMAT_MOD_NONE;
 		}
 
-		drm_gem_object_unreference_unlocked(gem_obj);
+		drm_gem_object_put_unlocked(gem_obj);
 
 		mode_cmd = &mode_cmd_local;
 	}
-- 
2.7.4

  parent reply	other threads:[~2017-08-10 12:19 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-10 12:09 [PATCH v2 00/29] DRM API Conversions Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 01/29] drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 02/29] drm: mali-dp: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 03/29] drm/armada: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 04/29] drm/ast: " Cihangir Akturk
2017-08-10 23:38   ` Joel Stanley
2017-08-10 12:09 ` [PATCH v2 05/29] drm/atmel-hlcdc: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 06/29] drm/bochs: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 07/29] drm/cirrus: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 08/29] drm/etnaviv: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 09/29] drm/exynos: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 10/29] drm/gma500: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 11/29] drm/hisilicon: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 12/29] drm/i915: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 13/29] drm/imx: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 14/29] drm/mediatek: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 15/29] drm/mgag200: " Cihangir Akturk
2017-08-10 12:09 ` [PATCH v2 16/29] drm/msm: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 17/29] drm/nouveau: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 18/29] drm/omap: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 19/29] drm/qxl: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 20/29] drm/radeon: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 21/29] drm/rockchip: " Cihangir Akturk
2017-08-10 18:16   ` Sean Paul
2017-08-10 19:52     ` Cihangir Akturk
2017-08-10 19:55       ` Sean Paul
2017-08-10 12:10 ` [PATCH v2 22/29] drm/tegra: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 23/29] drm/tilcdc: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 24/29] drm/udl: " Cihangir Akturk
2017-08-10 12:10 ` Cihangir Akturk [this message]
2017-08-10 12:10 ` [PATCH v2 26/29] drm/vgem: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 27/29] drm/virtio: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 28/29] drm/vmwgfx: " Cihangir Akturk
2017-08-10 12:10 ` [PATCH v2 29/29] staging: vboxvideo: " Cihangir Akturk

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=1502367012-9417-26-git-send-email-cakturk@gmail.com \
    --to=cakturk@gmail.com \
    --cc=airlied@linux.ie \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=eric@anholt.net \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®