* [PATCH v3 00/28] DRM API Conversions
@ 2017-08-11 12:32 Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
0 siblings, 2 replies; 6+ messages in thread
From: Cihangir Akturk @ 2017-08-11 12:32 UTC (permalink / raw)
Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
etnaviv-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Cihangir Akturk,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, daniel-/w4YWyX8dFk,
nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Changes since v2:
- Patch series is based on *drm-misc-next* as suggested by Sean Paul.
- Dropped patch 05 (drm/atmel-hlcdc) and patch 25 (drm/vc4) from v2,
since they were already pulled in the drm-misc-next
Changes since v1:
- This time patches were generated with coccinelle instead of my own
script, as suggested by Daniel Vetter.
- Fixed the typo in commit messages. s/adn/and
Note: I've included r-b, a-b tags, as these patches are identical to v1
except for the file: drivers/gpu/drm/i915/i915_gem_object.h
This patch set replaces the occurrences of drm_*_reference() and
drm_*_unreference() with the new drm_*_get() and drm_*_put() functions.
All patches in the series do the same thing, converting to the new APIs.
I created patches per DRM driver as suggested by Daniel Vetter.
This patch set was generated by scripts/coccinelle/api/drm-get-put.cocci
Previous thread can be reached at:
https://marc.info/?l=dri-devel&m=150178288816047
Background:
In the kernel, reference counting APIs use *_get(), *_put() style naming
to reference-count the objects. But DRM subsystem uses a different
naming for them such as *_reference(), *_unreference() which is
inconsistent with the other reference counting APIs in the kernel. To
solve this consistency issue, Thierry Reding introduced a couple of
functions and compatibility aliases in the following commits for them.
commit 020a218f95bd3ceff7dd1022ff7ebc0497bc7bf9
Author: Thierry Reding <treding@nvidia.com>
Date: Tue Feb 28 15:46:38 2017 +0100
drm: Introduce drm_mode_object_{get,put}()
commit ad09360750afa18a0a0ce0253d6ea6033abc22e7
Author: Thierry Reding <treding@nvidia.com>
Date: Tue Feb 28 15:46:39 2017 +0100
drm: Introduce drm_connector_{get,put}()
commit a4a69da06bc11a937a6e417938b1bb698ee1fa46
Author: Thierry Reding <treding@nvidia.com>
Date: Tue Feb 28 15:46:40 2017 +0100
drm: Introduce drm_framebuffer_{get,put}()
commit e6b62714e87c8811d5564b6a0738dcde63a51774
Author: Thierry Reding <treding@nvidia.com>
Date: Tue Feb 28 15:46:41 2017 +0100
drm: Introduce drm_gem_object_{get,put}()
commit 6472e5090be7c78749a3c279b4faae87ab835c40
Author: Thierry Reding <treding@nvidia.com>
Date: Tue Feb 28 15:46:42 2017 +0100
drm: Introduce drm_property_blob_{get,put}()
Cihangir Akturk (28):
drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers
drm: mali-dp: switch to drm_*_get(), drm_*_put() helpers
drm/armada: switch to drm_*_get(), drm_*_put() helpers
drm/ast: switch to drm_*_get(), drm_*_put() helpers
drm/bochs: switch to drm_*_get(), drm_*_put() helpers
drm/cirrus: switch to drm_*_get(), drm_*_put() helpers
drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers
drm/exynos: switch to drm_*_get(), drm_*_put() helpers
drm/gma500: switch to drm_*_get(), drm_*_put() helpers
drm/hisilicon: switch to drm_*_get(), drm_*_put() helpers
drm/i915: switch to drm_*_get(), drm_*_put() helpers
drm/imx: switch to drm_*_get(), drm_*_put() helpers
drm/mediatek: switch to drm_*_get(), drm_*_put() helpers
drm/mgag200: switch to drm_*_get(), drm_*_put() helpers
drm/msm: switch to drm_*_get(), drm_*_put() helpers
drm/nouveau: switch to drm_*_get(), drm_*_put() helpers
drm/omapdrm: switch to drm_*_get(), drm_*_put() helpers
drm/qxl: switch to drm_*_get(), drm_*_put() helpers
drm/radeon: switch to drm_*_get(), drm_*_put() helpers
drm/rockchip: switch to drm_*_get(), drm_*_put() helpers
drm/tegra: switch to drm_*_get(), drm_*_put() helpers
drm/tilcdc: switch to drm_*_get(), drm_*_put() helpers
drm/udl: switch to drm_*_get(), drm_*_put() helpers
drm/vc4: switch to drm_*_get(), drm_*_put() helpers
drm/vgem: switch to drm_*_get(), drm_*_put() helpers
drm/virtio: switch to drm_*_get(), drm_*_put() helpers
drm/vmwgfx: switch to drm_*_get(), drm_*_put() helpers
drm: vboxvideo: switch to drm_*_get(), drm_*_put() helpers
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 ++++++++---------
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 ++---
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 ++---
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 ++---
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 ++---
drivers/gpu/drm/arm/malidp_planes.c | 2 +-
drivers/gpu/drm/armada/armada_crtc.c | 22 ++++++++---------
drivers/gpu/drm/armada/armada_drv.c | 2 +-
drivers/gpu/drm/armada/armada_fb.c | 8 +++---
drivers/gpu/drm/armada/armada_fbdev.c | 6 ++---
drivers/gpu/drm/armada/armada_gem.c | 14 +++++------
drivers/gpu/drm/armada/armada_overlay.c | 4 +--
drivers/gpu/drm/ast/ast_fb.c | 2 +-
drivers/gpu/drm/ast/ast_main.c | 10 ++++----
drivers/gpu/drm/ast/ast_mode.c | 6 ++---
drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +-
drivers/gpu/drm/bochs/bochs_mm.c | 10 ++++----
drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +-
drivers/gpu/drm/cirrus/cirrus_main.c | 10 ++++----
drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++---
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 20 +++++++--------
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +--
drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +--
drivers/gpu/drm/exynos/exynos_drm_gem.c | 12 ++++-----
drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
drivers/gpu/drm/gma500/framebuffer.c | 4 +--
drivers/gpu/drm/gma500/gem.c | 4 +--
drivers/gpu/drm/gma500/gma_display.c | 6 ++---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 4 +--
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +++---
drivers/gpu/drm/i915/i915_gem_object.h | 4 +--
drivers/gpu/drm/i915/intel_display.c | 24 +++++++++---------
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/intel_fbdev.c | 4 +--
drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_fb.c | 4 +--
drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +--
drivers/gpu/drm/mgag200/mgag200_main.c | 10 ++++----
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 ++++----
drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 ++---
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +--
drivers/gpu/drm/msm/msm_drv.c | 8 +++---
drivers/gpu/drm/msm/msm_fb.c | 4 +--
drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
drivers/gpu/drm/msm/msm_gem.c | 8 +++---
drivers/gpu/drm/msm/msm_gem_submit.c | 4 +--
drivers/gpu/drm/msm/msm_gpu.c | 4 +--
drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_display.c | 8 +++---
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +++++------
drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
drivers/gpu/drm/omapdrm/omap_fb.c | 4 +--
drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
drivers/gpu/drm/omapdrm/omap_gem.c | 4 +--
drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
drivers/gpu/drm/qxl/qxl_display.c | 4 +--
drivers/gpu/drm/qxl/qxl_dumb.c | 2 +-
drivers/gpu/drm/qxl/qxl_fb.c | 6 ++---
drivers/gpu/drm/qxl/qxl_gem.c | 2 +-
drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +--
drivers/gpu/drm/qxl/qxl_object.c | 6 ++---
drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
drivers/gpu/drm/radeon/radeon_cursor.c | 6 ++---
drivers/gpu/drm/radeon/radeon_display.c | 12 ++++-----
drivers/gpu/drm/radeon/radeon_fb.c | 4 +--
drivers/gpu/drm/radeon/radeon_gem.c | 30 +++++++++++------------
drivers/gpu/drm/radeon/radeon_object.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 ++---
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +--
drivers/gpu/drm/tegra/drm.c | 12 ++++-----
drivers/gpu/drm/tegra/fb.c | 8 +++---
drivers/gpu/drm/tegra/gem.c | 10 ++++----
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 ++---
drivers/gpu/drm/udl/udl_fb.c | 6 ++---
drivers/gpu/drm/udl/udl_gem.c | 4 +--
drivers/gpu/drm/vc4/vc4_bo.c | 2 +-
drivers/gpu/drm/vgem/vgem_drv.c | 4 +--
drivers/gpu/drm/vgem/vgem_fence.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_display.c | 4 +--
drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +--
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 14 +++++------
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +--
drivers/staging/vboxvideo/vbox_fb.c | 2 +-
drivers/staging/vboxvideo/vbox_main.c | 8 +++---
drivers/staging/vboxvideo/vbox_mode.c | 2 +-
103 files changed, 294 insertions(+), 294 deletions(-)
--
2.7.4
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers
2017-08-11 12:32 [PATCH v3 00/28] DRM API Conversions Cihangir Akturk
@ 2017-08-11 12:32 ` Cihangir Akturk
2017-08-11 16:11 ` Daniel Vetter
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
1 sibling, 1 reply; 6+ messages in thread
From: Cihangir Akturk @ 2017-08-11 12:32 UTC (permalink / raw)
Cc: David Airlie, intel-gfx, linux-kernel, Cihangir Akturk, dri-devel,
Daniel Vetter
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/i915/i915_gem_object.h | 4 ++--
drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++------------
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
drivers/gpu/drm/i915/intel_fbdev.c | 4 ++--
4 files changed, 17 insertions(+), 17 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 684d653..70ebc19 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2672,10 +2672,10 @@ update_state_fb(struct drm_plane *plane)
return;
if (plane->state->fb)
- drm_framebuffer_unreference(plane->state->fb);
+ drm_framebuffer_put(plane->state->fb);
plane->state->fb = plane->fb;
if (plane->state->fb)
- drm_framebuffer_reference(plane->state->fb);
+ drm_framebuffer_get(plane->state->fb);
}
static void
@@ -2746,7 +2746,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;
}
}
@@ -2777,7 +2777,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;
}
@@ -2798,7 +2798,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;
@@ -9683,7 +9683,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;
@@ -9864,7 +9864,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)
@@ -10174,7 +10174,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
intel_frontbuffer_flip_complete(to_i915(dev),
to_intel_plane(primary)->frontbuffer_bit);
intel_fbc_post_update(crtc);
- drm_framebuffer_unreference(work->old_fb);
+ drm_framebuffer_put(work->old_fb);
BUG_ON(atomic_read(&crtc->unpin_work_count) == 0);
atomic_dec(&crtc->unpin_work_count);
@@ -10814,7 +10814,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
flush_workqueue(dev_priv->wq);
/* Reference the objects for the scheduled work. */
- drm_framebuffer_reference(work->old_fb);
+ drm_framebuffer_get(work->old_fb);
crtc->primary->fb = fb;
update_state_fb(crtc->primary);
@@ -10928,7 +10928,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
update_state_fb(crtc->primary);
i915_gem_object_put(obj);
- drm_framebuffer_unreference(work->old_fb);
+ drm_framebuffer_put(work->old_fb);
spin_lock_irq(&dev->event_lock);
intel_crtc->flip_work = NULL;
@@ -11252,7 +11252,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 =
@@ -11260,7 +11260,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 5856855..99a6fd8 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -501,7 +501,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 0986ca4..5568e33 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)) {
@@ -626,7 +626,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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* RE: [PATCH v3 00/28] DRM API Conversions
2017-08-11 12:32 [PATCH v3 00/28] DRM API Conversions Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
@ 2017-08-11 14:24 ` Deucher, Alexander
2017-08-11 15:21 ` Cihangir Akturk
1 sibling, 1 reply; 6+ messages in thread
From: Deucher, Alexander @ 2017-08-11 14:24 UTC (permalink / raw)
To: 'Cihangir Akturk'
Cc: devel@driverdev.osuosl.org, linux-arm-msm@vger.kernel.org,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org,
amd-gfx@lists.freedesktop.org, daniel@ffwll.ch,
nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org,
virtualization@lists.linux-foundation.org,
freedreno@lists.freedesktop.org
> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Cihangir Akturk
> Sent: Friday, August 11, 2017 8:33 AM
> Cc: devel@driverdev.osuosl.org; linux-arm-msm@vger.kernel.org; intel-
> gfx@lists.freedesktop.org; linux-kernel@vger.kernel.org; dri-
> devel@lists.freedesktop.org; etnaviv@lists.freedesktop.org; Cihangir Akturk;
> amd-gfx@lists.freedesktop.org; daniel@ffwll.ch;
> nouveau@lists.freedesktop.org; linux-tegra@vger.kernel.org;
> virtualization@lists.linux-foundation.org; freedreno@lists.freedesktop.org
> Subject: [PATCH v3 00/28] DRM API Conversions
>
> Changes since v2:
>
> - Patch series is based on *drm-misc-next* as suggested by Sean Paul.
>
> - Dropped patch 05 (drm/atmel-hlcdc) and patch 25 (drm/vc4) from v2,
> since they were already pulled in the drm-misc-next
>
> Changes since v1:
>
> - This time patches were generated with coccinelle instead of my own
> script, as suggested by Daniel Vetter.
>
> - Fixed the typo in commit messages. s/adn/and
>
FWIW, I already picked up v1 of these patches for radeon and amdgpu.
Alex
> Note: I've included r-b, a-b tags, as these patches are identical to v1
> except for the file: drivers/gpu/drm/i915/i915_gem_object.h
>
> This patch set replaces the occurrences of drm_*_reference() and
> drm_*_unreference() with the new drm_*_get() and drm_*_put()
> functions.
> All patches in the series do the same thing, converting to the new APIs.
> I created patches per DRM driver as suggested by Daniel Vetter.
>
> This patch set was generated by scripts/coccinelle/api/drm-get-put.cocci
>
> Previous thread can be reached at:
> https://marc.info/?l=dri-devel&m=150178288816047
>
> Background:
>
> In the kernel, reference counting APIs use *_get(), *_put() style naming
> to reference-count the objects. But DRM subsystem uses a different
> naming for them such as *_reference(), *_unreference() which is
> inconsistent with the other reference counting APIs in the kernel. To
> solve this consistency issue, Thierry Reding introduced a couple of
> functions and compatibility aliases in the following commits for them.
>
> commit 020a218f95bd3ceff7dd1022ff7ebc0497bc7bf9
> Author: Thierry Reding <treding@nvidia.com>
> Date: Tue Feb 28 15:46:38 2017 +0100
>
> drm: Introduce drm_mode_object_{get,put}()
>
> commit ad09360750afa18a0a0ce0253d6ea6033abc22e7
> Author: Thierry Reding <treding@nvidia.com>
> Date: Tue Feb 28 15:46:39 2017 +0100
>
> drm: Introduce drm_connector_{get,put}()
>
> commit a4a69da06bc11a937a6e417938b1bb698ee1fa46
> Author: Thierry Reding <treding@nvidia.com>
> Date: Tue Feb 28 15:46:40 2017 +0100
>
> drm: Introduce drm_framebuffer_{get,put}()
>
> commit e6b62714e87c8811d5564b6a0738dcde63a51774
> Author: Thierry Reding <treding@nvidia.com>
> Date: Tue Feb 28 15:46:41 2017 +0100
>
> drm: Introduce drm_gem_object_{get,put}()
>
> commit 6472e5090be7c78749a3c279b4faae87ab835c40
> Author: Thierry Reding <treding@nvidia.com>
> Date: Tue Feb 28 15:46:42 2017 +0100
>
> drm: Introduce drm_property_blob_{get,put}()
>
> Cihangir Akturk (28):
> drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers
> drm: mali-dp: switch to drm_*_get(), drm_*_put() helpers
> drm/armada: switch to drm_*_get(), drm_*_put() helpers
> drm/ast: switch to drm_*_get(), drm_*_put() helpers
> drm/bochs: switch to drm_*_get(), drm_*_put() helpers
> drm/cirrus: switch to drm_*_get(), drm_*_put() helpers
> drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers
> drm/exynos: switch to drm_*_get(), drm_*_put() helpers
> drm/gma500: switch to drm_*_get(), drm_*_put() helpers
> drm/hisilicon: switch to drm_*_get(), drm_*_put() helpers
> drm/i915: switch to drm_*_get(), drm_*_put() helpers
> drm/imx: switch to drm_*_get(), drm_*_put() helpers
> drm/mediatek: switch to drm_*_get(), drm_*_put() helpers
> drm/mgag200: switch to drm_*_get(), drm_*_put() helpers
> drm/msm: switch to drm_*_get(), drm_*_put() helpers
> drm/nouveau: switch to drm_*_get(), drm_*_put() helpers
> drm/omapdrm: switch to drm_*_get(), drm_*_put() helpers
> drm/qxl: switch to drm_*_get(), drm_*_put() helpers
> drm/radeon: switch to drm_*_get(), drm_*_put() helpers
> drm/rockchip: switch to drm_*_get(), drm_*_put() helpers
> drm/tegra: switch to drm_*_get(), drm_*_put() helpers
> drm/tilcdc: switch to drm_*_get(), drm_*_put() helpers
> drm/udl: switch to drm_*_get(), drm_*_put() helpers
> drm/vc4: switch to drm_*_get(), drm_*_put() helpers
> drm/vgem: switch to drm_*_get(), drm_*_put() helpers
> drm/virtio: switch to drm_*_get(), drm_*_put() helpers
> drm/vmwgfx: switch to drm_*_get(), drm_*_put() helpers
> drm: vboxvideo: switch to drm_*_get(), drm_*_put() helpers
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +--
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 ++++++++---------
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 ++---
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 ++---
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 ++---
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 ++---
> drivers/gpu/drm/arm/malidp_planes.c | 2 +-
> drivers/gpu/drm/armada/armada_crtc.c | 22 ++++++++---------
> drivers/gpu/drm/armada/armada_drv.c | 2 +-
> drivers/gpu/drm/armada/armada_fb.c | 8 +++---
> drivers/gpu/drm/armada/armada_fbdev.c | 6 ++---
> drivers/gpu/drm/armada/armada_gem.c | 14 +++++------
> drivers/gpu/drm/armada/armada_overlay.c | 4 +--
> drivers/gpu/drm/ast/ast_fb.c | 2 +-
> drivers/gpu/drm/ast/ast_main.c | 10 ++++----
> drivers/gpu/drm/ast/ast_mode.c | 6 ++---
> drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +-
> drivers/gpu/drm/bochs/bochs_mm.c | 10 ++++----
> drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +-
> drivers/gpu/drm/cirrus/cirrus_main.c | 10 ++++----
> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++---
> drivers/gpu/drm/etnaviv/etnaviv_gem.c | 20 +++++++--------
> drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
> drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +--
> drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +--
> drivers/gpu/drm/exynos/exynos_drm_gem.c | 12 ++++-----
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
> drivers/gpu/drm/gma500/framebuffer.c | 4 +--
> drivers/gpu/drm/gma500/gem.c | 4 +--
> drivers/gpu/drm/gma500/gma_display.c | 6 ++---
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 4 +--
> drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +++---
> drivers/gpu/drm/i915/i915_gem_object.h | 4 +--
> drivers/gpu/drm/i915/intel_display.c | 24 +++++++++---------
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> drivers/gpu/drm/i915/intel_fbdev.c | 4 +--
> drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_drm_fb.c | 4 +--
> drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +--
> drivers/gpu/drm/mgag200/mgag200_main.c | 10 ++++----
> drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 ++++----
> drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 ++---
> drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +-
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +--
> drivers/gpu/drm/msm/msm_drv.c | 8 +++---
> drivers/gpu/drm/msm/msm_fb.c | 4 +--
> drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
> drivers/gpu/drm/msm/msm_gem.c | 8 +++---
> drivers/gpu/drm/msm/msm_gem_submit.c | 4 +--
> drivers/gpu/drm/msm/msm_gpu.c | 4 +--
> drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_display.c | 8 +++---
> drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +++++------
> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_fb.c | 4 +--
> drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
> drivers/gpu/drm/omapdrm/omap_gem.c | 4 +--
> drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
> drivers/gpu/drm/qxl/qxl_display.c | 4 +--
> drivers/gpu/drm/qxl/qxl_dumb.c | 2 +-
> drivers/gpu/drm/qxl/qxl_fb.c | 6 ++---
> drivers/gpu/drm/qxl/qxl_gem.c | 2 +-
> drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +--
> drivers/gpu/drm/qxl/qxl_object.c | 6 ++---
> drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
> drivers/gpu/drm/radeon/radeon_cursor.c | 6 ++---
> drivers/gpu/drm/radeon/radeon_display.c | 12 ++++-----
> drivers/gpu/drm/radeon/radeon_fb.c | 4 +--
> drivers/gpu/drm/radeon/radeon_gem.c | 30 +++++++++++------------
> drivers/gpu/drm/radeon/radeon_object.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 ++---
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +--
> drivers/gpu/drm/tegra/drm.c | 12 ++++-----
> drivers/gpu/drm/tegra/fb.c | 8 +++---
> drivers/gpu/drm/tegra/gem.c | 10 ++++----
> drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 ++---
> drivers/gpu/drm/udl/udl_fb.c | 6 ++---
> drivers/gpu/drm/udl/udl_gem.c | 4 +--
> drivers/gpu/drm/vc4/vc4_bo.c | 2 +-
> drivers/gpu/drm/vgem/vgem_drv.c | 4 +--
> drivers/gpu/drm/vgem/vgem_fence.c | 2 +-
> drivers/gpu/drm/virtio/virtgpu_display.c | 4 +--
> drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +--
> drivers/gpu/drm/virtio/virtgpu_ioctl.c | 14 +++++------
> drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +--
> drivers/staging/vboxvideo/vbox_fb.c | 2 +-
> drivers/staging/vboxvideo/vbox_main.c | 8 +++---
> drivers/staging/vboxvideo/vbox_mode.c | 2 +-
> 103 files changed, 294 insertions(+), 294 deletions(-)
>
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 00/28] DRM API Conversions
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
@ 2017-08-11 15:21 ` Cihangir Akturk
0 siblings, 0 replies; 6+ messages in thread
From: Cihangir Akturk @ 2017-08-11 15:21 UTC (permalink / raw)
To: Deucher, Alexander
Cc: devel@driverdev.osuosl.org, linux-arm-msm@vger.kernel.org,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org,
amd-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org,
linux-tegra@vger.kernel.org,
virtualization@lists.linux-foundation.org,
freedreno@lists.freedesktop.org
On Fri, Aug 11, 2017 at 02:24:19PM +0000, Deucher, Alexander wrote:
> > -----Original Message-----
> > From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> > Of Cihangir Akturk
> > Sent: Friday, August 11, 2017 8:33 AM
> > Cc: devel@driverdev.osuosl.org; linux-arm-msm@vger.kernel.org; intel-
> > gfx@lists.freedesktop.org; linux-kernel@vger.kernel.org; dri-
> > devel@lists.freedesktop.org; etnaviv@lists.freedesktop.org; Cihangir Akturk;
> > amd-gfx@lists.freedesktop.org; daniel@ffwll.ch;
> > nouveau@lists.freedesktop.org; linux-tegra@vger.kernel.org;
> > virtualization@lists.linux-foundation.org; freedreno@lists.freedesktop.org
> > Subject: [PATCH v3 00/28] DRM API Conversions
> >
> > Changes since v2:
> >
> > - Patch series is based on *drm-misc-next* as suggested by Sean Paul.
> >
> > - Dropped patch 05 (drm/atmel-hlcdc) and patch 25 (drm/vc4) from v2,
> > since they were already pulled in the drm-misc-next
> >
> > Changes since v1:
> >
> > - This time patches were generated with coccinelle instead of my own
> > script, as suggested by Daniel Vetter.
> >
> > - Fixed the typo in commit messages. s/adn/and
> >
>
> FWIW, I already picked up v1 of these patches for radeon and amdgpu.
I think you can skip these patches of v3 for amdgpu and radeon, as
they have remained unchanged since v1.
>
> Alex
>
> > Note: I've included r-b, a-b tags, as these patches are identical to v1
> > except for the file: drivers/gpu/drm/i915/i915_gem_object.h
> >
> > This patch set replaces the occurrences of drm_*_reference() and
> > drm_*_unreference() with the new drm_*_get() and drm_*_put()
> > functions.
> > All patches in the series do the same thing, converting to the new APIs.
> > I created patches per DRM driver as suggested by Daniel Vetter.
> >
> > This patch set was generated by scripts/coccinelle/api/drm-get-put.cocci
> >
> > Previous thread can be reached at:
> > https://marc.info/?l=dri-devel&m=150178288816047
> >
> > Background:
> >
> > In the kernel, reference counting APIs use *_get(), *_put() style naming
> > to reference-count the objects. But DRM subsystem uses a different
> > naming for them such as *_reference(), *_unreference() which is
> > inconsistent with the other reference counting APIs in the kernel. To
> > solve this consistency issue, Thierry Reding introduced a couple of
> > functions and compatibility aliases in the following commits for them.
> >
> > commit 020a218f95bd3ceff7dd1022ff7ebc0497bc7bf9
> > Author: Thierry Reding <treding@nvidia.com>
> > Date: Tue Feb 28 15:46:38 2017 +0100
> >
> > drm: Introduce drm_mode_object_{get,put}()
> >
> > commit ad09360750afa18a0a0ce0253d6ea6033abc22e7
> > Author: Thierry Reding <treding@nvidia.com>
> > Date: Tue Feb 28 15:46:39 2017 +0100
> >
> > drm: Introduce drm_connector_{get,put}()
> >
> > commit a4a69da06bc11a937a6e417938b1bb698ee1fa46
> > Author: Thierry Reding <treding@nvidia.com>
> > Date: Tue Feb 28 15:46:40 2017 +0100
> >
> > drm: Introduce drm_framebuffer_{get,put}()
> >
> > commit e6b62714e87c8811d5564b6a0738dcde63a51774
> > Author: Thierry Reding <treding@nvidia.com>
> > Date: Tue Feb 28 15:46:41 2017 +0100
> >
> > drm: Introduce drm_gem_object_{get,put}()
> >
> > commit 6472e5090be7c78749a3c279b4faae87ab835c40
> > Author: Thierry Reding <treding@nvidia.com>
> > Date: Tue Feb 28 15:46:42 2017 +0100
> >
> > drm: Introduce drm_property_blob_{get,put}()
> >
> > Cihangir Akturk (28):
> > drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers
> > drm: mali-dp: switch to drm_*_get(), drm_*_put() helpers
> > drm/armada: switch to drm_*_get(), drm_*_put() helpers
> > drm/ast: switch to drm_*_get(), drm_*_put() helpers
> > drm/bochs: switch to drm_*_get(), drm_*_put() helpers
> > drm/cirrus: switch to drm_*_get(), drm_*_put() helpers
> > drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers
> > drm/exynos: switch to drm_*_get(), drm_*_put() helpers
> > drm/gma500: switch to drm_*_get(), drm_*_put() helpers
> > drm/hisilicon: switch to drm_*_get(), drm_*_put() helpers
> > drm/i915: switch to drm_*_get(), drm_*_put() helpers
> > drm/imx: switch to drm_*_get(), drm_*_put() helpers
> > drm/mediatek: switch to drm_*_get(), drm_*_put() helpers
> > drm/mgag200: switch to drm_*_get(), drm_*_put() helpers
> > drm/msm: switch to drm_*_get(), drm_*_put() helpers
> > drm/nouveau: switch to drm_*_get(), drm_*_put() helpers
> > drm/omapdrm: switch to drm_*_get(), drm_*_put() helpers
> > drm/qxl: switch to drm_*_get(), drm_*_put() helpers
> > drm/radeon: switch to drm_*_get(), drm_*_put() helpers
> > drm/rockchip: switch to drm_*_get(), drm_*_put() helpers
> > drm/tegra: switch to drm_*_get(), drm_*_put() helpers
> > drm/tilcdc: switch to drm_*_get(), drm_*_put() helpers
> > drm/udl: switch to drm_*_get(), drm_*_put() helpers
> > drm/vc4: switch to drm_*_get(), drm_*_put() helpers
> > drm/vgem: switch to drm_*_get(), drm_*_put() helpers
> > drm/virtio: switch to drm_*_get(), drm_*_put() helpers
> > drm/vmwgfx: switch to drm_*_get(), drm_*_put() helpers
> > drm: vboxvideo: switch to drm_*_get(), drm_*_put() helpers
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +-
> > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 +--
> > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 22 ++++++++---------
> > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 ++---
> > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 ++---
> > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 ++---
> > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 ++---
> > drivers/gpu/drm/arm/malidp_planes.c | 2 +-
> > drivers/gpu/drm/armada/armada_crtc.c | 22 ++++++++---------
> > drivers/gpu/drm/armada/armada_drv.c | 2 +-
> > drivers/gpu/drm/armada/armada_fb.c | 8 +++---
> > drivers/gpu/drm/armada/armada_fbdev.c | 6 ++---
> > drivers/gpu/drm/armada/armada_gem.c | 14 +++++------
> > drivers/gpu/drm/armada/armada_overlay.c | 4 +--
> > drivers/gpu/drm/ast/ast_fb.c | 2 +-
> > drivers/gpu/drm/ast/ast_main.c | 10 ++++----
> > drivers/gpu/drm/ast/ast_mode.c | 6 ++---
> > drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +-
> > drivers/gpu/drm/bochs/bochs_mm.c | 10 ++++----
> > drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +-
> > drivers/gpu/drm/cirrus/cirrus_main.c | 10 ++++----
> > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++---
> > drivers/gpu/drm/etnaviv/etnaviv_gem.c | 20 +++++++--------
> > drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
> > drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +--
> > drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +--
> > drivers/gpu/drm/exynos/exynos_drm_gem.c | 12 ++++-----
> > drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
> > drivers/gpu/drm/gma500/framebuffer.c | 4 +--
> > drivers/gpu/drm/gma500/gem.c | 4 +--
> > drivers/gpu/drm/gma500/gma_display.c | 6 ++---
> > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 4 +--
> > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +++---
> > drivers/gpu/drm/i915/i915_gem_object.h | 4 +--
> > drivers/gpu/drm/i915/intel_display.c | 24 +++++++++---------
> > drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> > drivers/gpu/drm/i915/intel_fbdev.c | 4 +--
> > drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
> > drivers/gpu/drm/mediatek/mtk_drm_fb.c | 4 +--
> > drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +-
> > drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +-
> > drivers/gpu/drm/mgag200/mgag200_fb.c | 4 +--
> > drivers/gpu/drm/mgag200/mgag200_main.c | 10 ++++----
> > drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 10 ++++----
> > drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
> > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
> > drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 ++---
> > drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +-
> > drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +-
> > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 4 +--
> > drivers/gpu/drm/msm/msm_drv.c | 8 +++---
> > drivers/gpu/drm/msm/msm_fb.c | 4 +--
> > drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
> > drivers/gpu/drm/msm/msm_gem.c | 8 +++---
> > drivers/gpu/drm/msm/msm_gem_submit.c | 4 +--
> > drivers/gpu/drm/msm/msm_gpu.c | 4 +--
> > drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_display.c | 8 +++---
> > drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +++++------
> > drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
> > drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
> > drivers/gpu/drm/omapdrm/omap_fb.c | 4 +--
> > drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
> > drivers/gpu/drm/omapdrm/omap_gem.c | 4 +--
> > drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
> > drivers/gpu/drm/qxl/qxl_display.c | 4 +--
> > drivers/gpu/drm/qxl/qxl_dumb.c | 2 +-
> > drivers/gpu/drm/qxl/qxl_fb.c | 6 ++---
> > drivers/gpu/drm/qxl/qxl_gem.c | 2 +-
> > drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +--
> > drivers/gpu/drm/qxl/qxl_object.c | 6 ++---
> > drivers/gpu/drm/radeon/radeon_cs.c | 2 +-
> > drivers/gpu/drm/radeon/radeon_cursor.c | 6 ++---
> > drivers/gpu/drm/radeon/radeon_display.c | 12 ++++-----
> > drivers/gpu/drm/radeon/radeon_fb.c | 4 +--
> > drivers/gpu/drm/radeon/radeon_gem.c | 30 +++++++++++------------
> > drivers/gpu/drm/radeon/radeon_object.c | 2 +-
> > drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 ++---
> > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +-
> > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +-
> > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +--
> > drivers/gpu/drm/tegra/drm.c | 12 ++++-----
> > drivers/gpu/drm/tegra/fb.c | 8 +++---
> > drivers/gpu/drm/tegra/gem.c | 10 ++++----
> > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 ++---
> > drivers/gpu/drm/udl/udl_fb.c | 6 ++---
> > drivers/gpu/drm/udl/udl_gem.c | 4 +--
> > drivers/gpu/drm/vc4/vc4_bo.c | 2 +-
> > drivers/gpu/drm/vgem/vgem_drv.c | 4 +--
> > drivers/gpu/drm/vgem/vgem_fence.c | 2 +-
> > drivers/gpu/drm/virtio/virtgpu_display.c | 4 +--
> > drivers/gpu/drm/virtio/virtgpu_gem.c | 4 +--
> > drivers/gpu/drm/virtio/virtgpu_ioctl.c | 14 +++++------
> > drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
> > drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 4 +--
> > drivers/staging/vboxvideo/vbox_fb.c | 2 +-
> > drivers/staging/vboxvideo/vbox_main.c | 8 +++---
> > drivers/staging/vboxvideo/vbox_mode.c | 2 +-
> > 103 files changed, 294 insertions(+), 294 deletions(-)
> >
> > --
> > 2.7.4
> >
> > _______________________________________________
> > amd-gfx mailing list
> > amd-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
@ 2017-08-11 16:11 ` Daniel Vetter
2017-08-13 13:30 ` [PATCH] " Cihangir Akturk
0 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2017-08-11 16:11 UTC (permalink / raw)
To: Cihangir Akturk
Cc: David Airlie, intel-gfx, linux-kernel, dri-devel, Daniel Vetter
On Fri, Aug 11, 2017 at 03:32:57PM +0300, Cihangir Akturk wrote:
> 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>
Seems this is against a rather old version of drm/i915. Can you pls
regenerate against linux-next or the drm-tip branch from
https://cgit.freedesktop.org/drm-tip
But in general, for large-scale refactoring like this, the recommendation
is to base them on linux-next, since that will have all pending patches
applied for every part of the kernel.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem_object.h | 4 ++--
> drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++------------
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> drivers/gpu/drm/i915/intel_fbdev.c | 4 ++--
> 4 files changed, 17 insertions(+), 17 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 684d653..70ebc19 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2672,10 +2672,10 @@ update_state_fb(struct drm_plane *plane)
> return;
>
> if (plane->state->fb)
> - drm_framebuffer_unreference(plane->state->fb);
> + drm_framebuffer_put(plane->state->fb);
> plane->state->fb = plane->fb;
> if (plane->state->fb)
> - drm_framebuffer_reference(plane->state->fb);
> + drm_framebuffer_get(plane->state->fb);
> }
>
> static void
> @@ -2746,7 +2746,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;
> }
> }
> @@ -2777,7 +2777,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;
> }
>
> @@ -2798,7 +2798,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;
>
> @@ -9683,7 +9683,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;
> @@ -9864,7 +9864,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)
> @@ -10174,7 +10174,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
> intel_frontbuffer_flip_complete(to_i915(dev),
> to_intel_plane(primary)->frontbuffer_bit);
> intel_fbc_post_update(crtc);
> - drm_framebuffer_unreference(work->old_fb);
> + drm_framebuffer_put(work->old_fb);
>
> BUG_ON(atomic_read(&crtc->unpin_work_count) == 0);
> atomic_dec(&crtc->unpin_work_count);
> @@ -10814,7 +10814,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> flush_workqueue(dev_priv->wq);
>
> /* Reference the objects for the scheduled work. */
> - drm_framebuffer_reference(work->old_fb);
> + drm_framebuffer_get(work->old_fb);
>
> crtc->primary->fb = fb;
> update_state_fb(crtc->primary);
> @@ -10928,7 +10928,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> update_state_fb(crtc->primary);
>
> i915_gem_object_put(obj);
> - drm_framebuffer_unreference(work->old_fb);
> + drm_framebuffer_put(work->old_fb);
>
> spin_lock_irq(&dev->event_lock);
> intel_crtc->flip_work = NULL;
> @@ -11252,7 +11252,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 =
> @@ -11260,7 +11260,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 5856855..99a6fd8 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -501,7 +501,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 0986ca4..5568e33 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)) {
> @@ -626,7 +626,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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] drm/i915: switch to drm_*_get(), drm_*_put() helpers
2017-08-11 16:11 ` Daniel Vetter
@ 2017-08-13 13:30 ` Cihangir Akturk
0 siblings, 0 replies; 6+ messages in thread
From: Cihangir Akturk @ 2017-08-13 13:30 UTC (permalink / raw)
Cc: David Airlie, intel-gfx, linux-kernel, dri-devel, Cihangir Akturk,
Daniel Vetter
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-13 13:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-11 12:32 [PATCH v3 00/28] DRM API Conversions Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-11 16:11 ` Daniel Vetter
2017-08-13 13:30 ` [PATCH] " Cihangir Akturk
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
2017-08-11 15:21 ` Cihangir Akturk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox