From: Cihangir Akturk <cakturk@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Cihangir Akturk <cakturk@gmail.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
David Airlie <airlied@linux.ie>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] drm/i915: switch to drm_*_get(), drm_*_put() helpers
Date: Sun, 13 Aug 2017 16:30:08 +0300 [thread overview]
Message-ID: <1502631009-8927-1-git-send-email-cakturk@gmail.com> (raw)
In-Reply-To: <20170811161143.m6vpsu6el23p2w6j@phenom.ffwll.local>
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>
---
This patch was generated against *drm-tip*.
If needed, I can re-generate the whole series against *drm-tip* and
resend.
drivers/gpu/drm/i915/i915_gem_object.h | 4 ++--
drivers/gpu/drm/i915/intel_display.c | 14 +++++++-------
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/intel_fbdev.c | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_object.h b/drivers/gpu/drm/i915/i915_gem_object.h
index 5b19a49..95cfb64 100644
--- a/drivers/gpu/drm/i915/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/i915_gem_object.h
@@ -257,7 +257,7 @@ __attribute__((nonnull))
static inline struct drm_i915_gem_object *
i915_gem_object_get(struct drm_i915_gem_object *obj)
{
- drm_gem_object_reference(&obj->base);
+ drm_gem_object_get(&obj->base);
return obj;
}
@@ -268,7 +268,7 @@ __attribute__((nonnull))
static inline void
i915_gem_object_put(struct drm_i915_gem_object *obj)
{
- __drm_gem_object_unreference(&obj->base);
+ __drm_gem_object_put(&obj->base);
}
__deprecated
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index beff138..f9142ff 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2832,7 +2832,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
if (intel_plane_ggtt_offset(state) == plane_config->base) {
fb = c->primary->fb;
- drm_framebuffer_reference(fb);
+ drm_framebuffer_get(fb);
goto valid_fb;
}
}
@@ -2863,7 +2863,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
intel_crtc->pipe, PTR_ERR(intel_state->vma));
intel_state->vma = NULL;
- drm_framebuffer_unreference(fb);
+ drm_framebuffer_put(fb);
return;
}
@@ -2884,7 +2884,7 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
if (i915_gem_object_is_tiled(obj))
dev_priv->preserve_bios_swizzle = true;
- drm_framebuffer_reference(fb);
+ drm_framebuffer_get(fb);
primary->fb = primary->state->fb = fb;
primary->crtc = primary->state->crtc = &intel_crtc->base;
@@ -9811,7 +9811,7 @@ mode_fits_in_fbdev(struct drm_device *dev,
if (obj->base.size < mode->vdisplay * fb->pitches[0])
return NULL;
- drm_framebuffer_reference(fb);
+ drm_framebuffer_get(fb);
return fb;
#else
return NULL;
@@ -9992,7 +9992,7 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
if (ret)
goto fail;
- drm_framebuffer_unreference(fb);
+ drm_framebuffer_put(fb);
ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
if (ret)
@@ -10542,7 +10542,7 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev)
drm_connector_list_iter_begin(dev, &conn_iter);
for_each_intel_connector_iter(connector, &conn_iter) {
if (connector->base.state->crtc)
- drm_connector_unreference(&connector->base);
+ drm_connector_put(&connector->base);
if (connector->base.encoder) {
connector->base.state->best_encoder =
@@ -10550,7 +10550,7 @@ static void intel_modeset_update_connector_atomic_state(struct drm_device *dev)
connector->base.state->crtc =
connector->base.encoder->crtc;
- drm_connector_reference(&connector->base);
+ drm_connector_get(&connector->base);
} else {
connector->base.state->best_encoder = NULL;
connector->base.state->crtc = NULL;
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 93fc8ab..2092ab1 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -504,7 +504,7 @@ static void intel_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
intel_connector->mst_port = NULL;
drm_modeset_unlock(&connector->dev->mode_config.connection_mutex);
- drm_connector_unreference(connector);
+ drm_connector_put(connector);
DRM_DEBUG_KMS("\n");
}
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 262e75c..e34334a 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -189,7 +189,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
" releasing it\n",
intel_fb->base.width, intel_fb->base.height,
sizes->fb_width, sizes->fb_height);
- drm_framebuffer_unreference(&intel_fb->base);
+ drm_framebuffer_put(&intel_fb->base);
intel_fb = ifbdev->fb = NULL;
}
if (!intel_fb || WARN_ON(!intel_fb->obj)) {
@@ -624,7 +624,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
ifbdev->preferred_bpp = fb->base.format->cpp[0] * 8;
ifbdev->fb = fb;
- drm_framebuffer_reference(&ifbdev->fb->base);
+ drm_framebuffer_get(&ifbdev->fb->base);
/* Final pass to check if any active pipes don't have fbs */
for_each_crtc(dev, crtc) {
--
2.7.4
next prev parent reply other threads:[~2017-08-13 13:30 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 12:32 [PATCH v3 00/28] DRM API Conversions Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 01/28] drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 02/28] drm: mali-dp: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 03/28] drm/armada: " Cihangir Akturk
2017-08-17 9:13 ` Russell King - ARM Linux
2017-08-11 12:32 ` [PATCH v3 04/28] drm/ast: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 05/28] drm/bochs: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 06/28] drm/cirrus: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 07/28] drm/etnaviv: " Cihangir Akturk
2017-08-11 14:43 ` Lucas Stach
2017-08-11 15:01 ` Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 08/28] drm/exynos: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 09/28] drm/gma500: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 10/28] drm/hisilicon: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: " Cihangir Akturk
2017-08-11 16:11 ` Daniel Vetter
2017-08-13 13:30 ` Cihangir Akturk [this message]
2017-08-11 12:32 ` [PATCH v3 12/28] drm/imx: " Cihangir Akturk
2017-08-11 13:01 ` Philipp Zabel
2017-08-11 12:32 ` [PATCH v3 13/28] drm/mediatek: " Cihangir Akturk
2017-08-11 13:01 ` Philipp Zabel
2017-08-11 16:04 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 14/28] drm/mgag200: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 15/28] drm/msm: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 16/28] drm/nouveau: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 17/28] drm/omapdrm: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 18/28] drm/qxl: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 19/28] drm/radeon: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 20/28] drm/rockchip: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 21/28] drm/tegra: " Cihangir Akturk
2017-08-17 15:33 ` Thierry Reding
2017-08-11 12:33 ` [PATCH v3 22/28] drm/tilcdc: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 23/28] drm/udl: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 24/28] drm/vc4: " Cihangir Akturk
2017-08-14 19:47 ` Eric Anholt
2017-08-14 20:06 ` Cihangir Akturk
2017-08-14 21:11 ` Eric Anholt
2017-08-11 12:33 ` [PATCH v3 25/28] drm/vgem: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 26/28] drm/virtio: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 27/28] drm/vmwgfx: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 28/28] drm: vboxvideo: " Cihangir Akturk
2017-08-11 13:26 ` Hans de Goede
2017-08-11 16:04 ` Sean Paul
2017-08-11 16:11 ` Hans de Goede
2017-08-11 17:27 ` Sean Paul
2017-08-14 8:58 ` Daniel Vetter
2017-08-14 12:23 ` Hans de Goede
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
2017-08-11 15:21 ` 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=1502631009-8927-1-git-send-email-cakturk@gmail.com \
--to=cakturk@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--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
Powered by JetHome