* [PATCH v3 00/28] DRM API Conversions
@ 2017-08-11 12:32 Cihangir Akturk
[not found] ` <1502454794-28558-1-git-send-email-cakturk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
0 siblings, 2 replies; 4+ 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] 4+ messages in thread[parent not found: <1502454794-28558-1-git-send-email-cakturk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* [PATCH v3 15/28] drm/msm: switch to drm_*_get(), drm_*_put() helpers [not found] ` <1502454794-28558-1-git-send-email-cakturk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2017-08-11 12:33 ` Cihangir Akturk 0 siblings, 0 replies; 4+ messages in thread From: Cihangir Akturk @ 2017-08-11 12:33 UTC (permalink / raw) Cc: David Airlie, Daniel Vetter, Liviu Dudau, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Philippe Cornu, Sushmita Susheelendra, Eric Anholt, Ville Syrjälä, Rob Herring, Thomas Hellstrom, Laurent Pinchart, Arnd Bergmann, Masahiro Yamada, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA, Maarten Lankhorst, Archit Taneja, Russell King, Cihangir Akturk, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Rob Clark, daniel-/w4YWyX8dFk 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/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 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index b4b54f1..12d0f9c 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c @@ -303,7 +303,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu, ptr = msm_gem_get_vaddr(bo); if (!ptr) { - drm_gem_object_unreference(bo); + drm_gem_object_put(bo); return ERR_PTR(-ENOMEM); } @@ -311,7 +311,7 @@ static struct drm_gem_object *a5xx_ucode_load_bo(struct msm_gpu *gpu, int ret = msm_gem_get_iova(bo, gpu->aspace, iova); if (ret) { - drm_gem_object_unreference(bo); + drm_gem_object_put(bo); return ERR_PTR(ret); } } @@ -697,19 +697,19 @@ static void a5xx_destroy(struct msm_gpu *gpu) if (a5xx_gpu->pm4_bo) { if (a5xx_gpu->pm4_iova) msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace); - drm_gem_object_unreference_unlocked(a5xx_gpu->pm4_bo); + drm_gem_object_put_unlocked(a5xx_gpu->pm4_bo); } if (a5xx_gpu->pfp_bo) { if (a5xx_gpu->pfp_iova) msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace); - drm_gem_object_unreference_unlocked(a5xx_gpu->pfp_bo); + drm_gem_object_put_unlocked(a5xx_gpu->pfp_bo); } if (a5xx_gpu->gpmu_bo) { if (a5xx_gpu->gpmu_iova) msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace); - drm_gem_object_unreference_unlocked(a5xx_gpu->gpmu_bo); + drm_gem_object_put_unlocked(a5xx_gpu->gpmu_bo); } adreno_gpu_cleanup(adreno_gpu); diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c index 87af6ee..3333620 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_power.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c @@ -330,7 +330,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) if (a5xx_gpu->gpmu_iova) msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace); if (a5xx_gpu->gpmu_bo) - drm_gem_object_unreference(a5xx_gpu->gpmu_bo); + drm_gem_object_put(a5xx_gpu->gpmu_bo); a5xx_gpu->gpmu_bo = NULL; a5xx_gpu->gpmu_iova = 0; diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index f1ab270..15de821 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -433,7 +433,7 @@ void adreno_gpu_cleanup(struct adreno_gpu *adreno_gpu) if (adreno_gpu->memptrs_iova) msm_gem_put_iova(adreno_gpu->memptrs_bo, gpu->aspace); - drm_gem_object_unreference_unlocked(adreno_gpu->memptrs_bo); + drm_gem_object_put_unlocked(adreno_gpu->memptrs_bo); } release_firmware(adreno_gpu->pm4); release_firmware(adreno_gpu->pfp); diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c index 47fa2ab..5d4aba1 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c @@ -129,7 +129,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val) struct msm_kms *kms = &mdp4_kms->base.base; msm_gem_put_iova(val, kms->aspace); - drm_gem_object_unreference_unlocked(val); + drm_gem_object_put_unlocked(val); } static void mdp4_crtc_destroy(struct drm_crtc *crtc) @@ -375,7 +375,7 @@ static void update_cursor(struct drm_crtc *crtc) if (next_bo) { /* take a obj ref + iova ref when we start scanning out: */ - drm_gem_object_reference(next_bo); + drm_gem_object_get(next_bo); msm_gem_get_iova(next_bo, kms->aspace, &iova); /* enable cursor: */ @@ -460,7 +460,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, return 0; fail: - drm_gem_object_unreference_unlocked(cursor_bo); + drm_gem_object_put_unlocked(cursor_bo); return ret; } diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c index f7f0874..4b646bf 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c @@ -164,7 +164,7 @@ static void mdp4_destroy(struct msm_kms *kms) if (mdp4_kms->blank_cursor_iova) msm_gem_put_iova(mdp4_kms->blank_cursor_bo, kms->aspace); - drm_gem_object_unreference_unlocked(mdp4_kms->blank_cursor_bo); + drm_gem_object_put_unlocked(mdp4_kms->blank_cursor_bo); if (aspace) { aspace->mmu->funcs->detach(aspace->mmu, diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c index 5e3bc72..7aa4241 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c @@ -163,7 +163,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val) struct msm_kms *kms = &mdp5_kms->base.base; msm_gem_put_iova(val, kms->aspace); - drm_gem_object_unreference_unlocked(val); + drm_gem_object_put_unlocked(val); } static void mdp5_crtc_destroy(struct drm_crtc *crtc) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 818244a..cf4d63e 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -194,7 +194,7 @@ static void mdp5_plane_reset(struct drm_plane *plane) struct mdp5_plane_state *mdp5_state; if (plane->state && plane->state->fb) - drm_framebuffer_unreference(plane->state->fb); + drm_framebuffer_put(plane->state->fb); kfree(to_mdp5_plane_state(plane->state)); mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL); @@ -237,7 +237,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane, struct mdp5_plane_state *pstate = to_mdp5_plane_state(state); if (state->fb) - drm_framebuffer_unreference(state->fb); + drm_framebuffer_put(state->fb); kfree(pstate); } diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index f49f6ac..ba3c581 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -664,7 +664,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data, ret = msm_gem_cpu_prep(obj, args->op, &timeout); - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ret; } @@ -682,7 +682,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data, ret = msm_gem_cpu_fini(obj); - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ret; } @@ -722,7 +722,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data, args->offset = msm_gem_mmap_offset(obj); } - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ret; } @@ -776,7 +776,7 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data, ret = 0; } - drm_gem_object_unreference(obj); + drm_gem_object_put(obj); unlock: mutex_unlock(&dev->struct_mutex); diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c index 6ecb7b1..0a2b4bb 100644 --- a/drivers/gpu/drm/msm/msm_fb.c +++ b/drivers/gpu/drm/msm/msm_fb.c @@ -50,7 +50,7 @@ static void msm_framebuffer_destroy(struct drm_framebuffer *fb) for (i = 0; i < n; i++) { struct drm_gem_object *bo = msm_fb->planes[i]; - drm_gem_object_unreference_unlocked(bo); + drm_gem_object_put_unlocked(bo); } kfree(msm_fb); @@ -157,7 +157,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev, out_unref: for (i = 0; i < n; i++) - drm_gem_object_unreference_unlocked(bos[i]); + drm_gem_object_put_unlocked(bos[i]); return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index 9c00fed..d959064 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c @@ -112,7 +112,7 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, /* note: if fb creation failed, we can't rely on fb destroy * to unref the bo: */ - drm_gem_object_unreference_unlocked(fbdev->bo); + drm_gem_object_put_unlocked(fbdev->bo); ret = PTR_ERR(fb); goto fail; } diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 65f3554..98dbf22 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -462,7 +462,7 @@ int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, *offset = msm_gem_mmap_offset(obj); - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); fail: return ret; @@ -839,7 +839,7 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file, ret = drm_gem_handle_create(file, obj, handle); /* drop reference from allocate - handle holds it now */ - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ret; } @@ -955,7 +955,7 @@ static struct drm_gem_object *_msm_gem_new(struct drm_device *dev, return obj; fail: - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ERR_PTR(ret); } @@ -1015,6 +1015,6 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev, return obj; fail: - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 6bfca74..59982cf 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -139,7 +139,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, goto out_unlock; } - drm_gem_object_reference(obj); + drm_gem_object_get(obj); submit->bos[i].obj = msm_obj; @@ -375,7 +375,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) struct msm_gem_object *msm_obj = submit->bos[i].obj; submit_unlock_unpin_bo(submit, i); list_del_init(&msm_obj->submit_entry); - drm_gem_object_unreference(&msm_obj->base); + drm_gem_object_put(&msm_obj->base); } ww_acquire_fini(&submit->ticket); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 9f3dbc2..0d7c58b 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -417,7 +417,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) /* move to inactive: */ msm_gem_move_to_inactive(&msm_obj->base); msm_gem_put_iova(&msm_obj->base, gpu->aspace); - drm_gem_object_unreference(&msm_obj->base); + drm_gem_object_put(&msm_obj->base); } pm_runtime_mark_last_busy(&gpu->pdev->dev); @@ -496,7 +496,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, WARN_ON(is_active(msm_obj) && (msm_obj->gpu != gpu)); /* submit takes a reference to the bo and iova until retired: */ - drm_gem_object_reference(&msm_obj->base); + drm_gem_object_get(&msm_obj->base); msm_gem_get_iova(&msm_obj->base, submit->gpu->aspace, &iova); diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c index 791bca3..2ba978b 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.c +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c @@ -62,7 +62,7 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring) { if (ring->bo) { msm_gem_put_vaddr(ring->bo); - drm_gem_object_unreference_unlocked(ring->bo); + drm_gem_object_put_unlocked(ring->bo); } kfree(ring); } -- 2.7.4 _______________________________________________ Freedreno mailing list Freedreno@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/freedreno ^ permalink raw reply related [flat|nested] 4+ 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 [not found] ` <1502454794-28558-1-git-send-email-cakturk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2017-08-11 14:24 ` Deucher, Alexander 2017-08-11 15:21 ` Cihangir Akturk 1 sibling, 1 reply; 4+ 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] 4+ 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; 4+ 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] 4+ messages in thread
end of thread, other threads:[~2017-08-11 15:21 UTC | newest]
Thread overview: 4+ 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
[not found] ` <1502454794-28558-1-git-send-email-cakturk-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-08-11 12:33 ` [PATCH v3 15/28] drm/msm: switch to drm_*_get(), drm_*_put() helpers 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; as well as URLs for NNTP newsgroup(s).