Laurent Pinchart
2018-Apr-26 12:45 UTC
[Nouveau] [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
Hi Daniel, On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:> On Thu, Apr 26, 2018 at 03:58:19PM +0530, Vaishali Thakkar wrote: > > It's been a while since we introduced drm_dev{get/put} functions > > to replace reference/unreference in drm subsystem for the > > consistency purpose. So, with this patch, let's just replace > > all current use cases of drm_dev_unref() with drm_dev_put and remove > > the function itself. > > > > Coccinelle was used for mass-patching. > > > > Signed-off-by: Vaishali Thakkar <vthakkar1994 at gmail.com> > > Thanks for doing this. Unfortunately drm moves pretty fast, so already a > conflict when I tried to apply this. Some drivers are also in their own > trees, so this might lead to more fun :-/ > > Can you pls split it up per-driver (just the directories under > drivers/gpu/drm/ is enough)? Final patch to remove the function might then > get stalled a bit ofc.I requested a single patch instead of splitting it per driver, you might want to blame me for that.> Also can you pls update ./scripts/coccinelle/api/drm-get-put.cocci and > remove that spatch hunk in the final patch, since we no longer need it?How about just rerunning the coccinelle patch when it's time to apply this ? There's precedent for performing such automated changes, and it would ensure that no driver is left out.> > --- > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- > > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > > drivers/gpu/drm/armada/armada_drv.c | 6 +++--- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- > > drivers/gpu/drm/drm_drv.c | 13 ------------- > > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- > > drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ++-- > > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 ++-- > > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 ++-- > > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 ++++---- > > drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_gem_object.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- > > drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 2 +- > > drivers/gpu/drm/imx/imx-drm-core.c | 4 ++-- > > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- > > drivers/gpu/drm/msm/msm_drv.c | 8 ++++---- > > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- > > drivers/gpu/drm/nouveau/nouveau_platform.c | 2 +- > > drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- > > drivers/gpu/drm/pl111/pl111_drv.c | 4 ++-- > > drivers/gpu/drm/qxl/qxl_drv.c | 2 +- > > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- > > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- > > drivers/gpu/drm/sti/sti_drv.c | 8 ++++---- > > drivers/gpu/drm/stm/drv.c | 4 ++-- > > drivers/gpu/drm/sun4i/sun4i_drv.c | 4 ++-- > > drivers/gpu/drm/tegra/drm.c | 4 ++-- > > drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 6 +++--- > > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- > > drivers/gpu/drm/udl/udl_drv.c | 2 +- > > drivers/gpu/drm/vc4/vc4_drv.c | 4 ++-- > > drivers/gpu/drm/vgem/vgem_drv.c | 2 +- > > drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 2 +- > > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- > > include/drm/drm_drv.h | 1 - > > 41 files changed, 73 insertions(+), 87 deletions(-)-- Regards, Laurent Pinchart
Vaishali Thakkar
2018-Apr-26 12:57 UTC
[Nouveau] [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
On Thu, Apr 26, 2018 at 6:15 PM, Laurent Pinchart <laurent.pinchart at ideasonboard.com> wrote:> Hi Daniel, > > On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote: >> On Thu, Apr 26, 2018 at 03:58:19PM +0530, Vaishali Thakkar wrote: >> > It's been a while since we introduced drm_dev{get/put} functions >> > to replace reference/unreference in drm subsystem for the >> > consistency purpose. So, with this patch, let's just replace >> > all current use cases of drm_dev_unref() with drm_dev_put and remove >> > the function itself. >> > >> > Coccinelle was used for mass-patching. >> > >> > Signed-off-by: Vaishali Thakkar <vthakkar1994 at gmail.com> >> >> Thanks for doing this. Unfortunately drm moves pretty fast, so already a >> conflict when I tried to apply this. Some drivers are also in their own >> trees, so this might lead to more fun :-/ >> >> Can you pls split it up per-driver (just the directories under >> drivers/gpu/drm/ is enough)? Final patch to remove the function might then >> get stalled a bit ofc. > > I requested a single patch instead of splitting it per driver, you might want > to blame me for that. > >> Also can you pls update ./scripts/coccinelle/api/drm-get-put.cocci and >> remove that spatch hunk in the final patch, since we no longer need it? > > How about just rerunning the coccinelle patch when it's time to apply this ? > There's precedent for performing such automated changes, and it would ensure > that no driver is left out.I was planning to send patches to remove all remaining reference/unreference functions by the weekend [as there aren't much remaining now and I see that new drivers keeps adding them instead of new API]. So, wanted to delete whole cocci file after that. I thought of dividing a patch per function because Laurent requested to send a single patch for all files. But if we are going to split it per driver under gpu/drm, would it work if per driver patch contains all function cases? Also, would you be fine with taking a patch for removal of coccinelle file via your tree? Then I can include that in the same patchset as well. Thanks!>> > --- >> > >> > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ++-- >> > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- >> > drivers/gpu/drm/armada/armada_drv.c | 6 +++--- >> > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- >> > drivers/gpu/drm/drm_drv.c | 13 ------------- >> > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- >> > drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ++-- >> > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 ++-- >> > drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 ++-- >> > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 ++++---- >> > drivers/gpu/drm/i915/selftests/huge_pages.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_gem_object.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- >> > drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- >> > drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 2 +- >> > drivers/gpu/drm/imx/imx-drm-core.c | 4 ++-- >> > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +++--- >> > drivers/gpu/drm/msm/msm_drv.c | 8 ++++---- >> > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- >> > drivers/gpu/drm/nouveau/nouveau_platform.c | 2 +- >> > drivers/gpu/drm/omapdrm/omap_drv.c | 4 ++-- >> > drivers/gpu/drm/pl111/pl111_drv.c | 4 ++-- >> > drivers/gpu/drm/qxl/qxl_drv.c | 2 +- >> > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- >> > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 ++-- >> > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- >> > drivers/gpu/drm/sti/sti_drv.c | 8 ++++---- >> > drivers/gpu/drm/stm/drv.c | 4 ++-- >> > drivers/gpu/drm/sun4i/sun4i_drv.c | 4 ++-- >> > drivers/gpu/drm/tegra/drm.c | 4 ++-- >> > drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 6 +++--- >> > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- >> > drivers/gpu/drm/udl/udl_drv.c | 2 +- >> > drivers/gpu/drm/vc4/vc4_drv.c | 4 ++-- >> > drivers/gpu/drm/vgem/vgem_drv.c | 2 +- >> > drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 2 +- >> > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- >> > include/drm/drm_drv.h | 1 - >> > 41 files changed, 73 insertions(+), 87 deletions(-) > > -- > Regards, > > Laurent Pinchart > > >-- Vaishali http://vaishalithakkar.in/
Alexandre Belloni
2018-Apr-26 13:14 UTC
[Nouveau] [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
Hi, On 26/04/2018 15:45:44+0300, Laurent Pinchart wrote:> Hi Daniel, > > On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote: > > On Thu, Apr 26, 2018 at 03:58:19PM +0530, Vaishali Thakkar wrote: > > > It's been a while since we introduced drm_dev{get/put} functions > > > to replace reference/unreference in drm subsystem for the > > > consistency purpose. So, with this patch, let's just replace > > > all current use cases of drm_dev_unref() with drm_dev_put and remove > > > the function itself. > > > > > > Coccinelle was used for mass-patching. > > > > > > Signed-off-by: Vaishali Thakkar <vthakkar1994 at gmail.com> > > > > Thanks for doing this. Unfortunately drm moves pretty fast, so already a > > conflict when I tried to apply this. Some drivers are also in their own > > trees, so this might lead to more fun :-/ > > > > Can you pls split it up per-driver (just the directories under > > drivers/gpu/drm/ is enough)? Final patch to remove the function might then > > get stalled a bit ofc. > > I requested a single patch instead of splitting it per driver, you might want > to blame me for that. >Doesn't splitting the change per driver break bisectability unless there is a guarantee that the change in include/drm/drm_drv.h is applied after all the driver trees have been merged? -- Alexandre Belloni, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
Daniel Vetter
2018-Apr-26 13:52 UTC
[Nouveau] [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
On Thu, Apr 26, 2018 at 3:14 PM, Alexandre Belloni <alexandre.belloni at bootlin.com> wrote:> Hi, > > On 26/04/2018 15:45:44+0300, Laurent Pinchart wrote: >> Hi Daniel, >> >> On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote: >> > On Thu, Apr 26, 2018 at 03:58:19PM +0530, Vaishali Thakkar wrote: >> > > It's been a while since we introduced drm_dev{get/put} functions >> > > to replace reference/unreference in drm subsystem for the >> > > consistency purpose. So, with this patch, let's just replace >> > > all current use cases of drm_dev_unref() with drm_dev_put and remove >> > > the function itself. >> > > >> > > Coccinelle was used for mass-patching. >> > > >> > > Signed-off-by: Vaishali Thakkar <vthakkar1994 at gmail.com> >> > >> > Thanks for doing this. Unfortunately drm moves pretty fast, so already a >> > conflict when I tried to apply this. Some drivers are also in their own >> > trees, so this might lead to more fun :-/ >> > >> > Can you pls split it up per-driver (just the directories under >> > drivers/gpu/drm/ is enough)? Final patch to remove the function might then >> > get stalled a bit ofc. >> >> I requested a single patch instead of splitting it per driver, you might want >> to blame me for that. >> > > Doesn't splitting the change per driver break bisectability unless there > is a guarantee that the change in include/drm/drm_drv.h is applied after > all the driver trees have been merged?That's why I said the final patch will likely take a bit longer to get merged, since we have to wait until all the trees converge again. But since I have conflicts already looks like we can't take the shortcut :-( -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Reasonably Related Threads
- [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
- [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
- [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
- [Intel-gfx] [PATCH] drm/core: Remove drm_dev_unref() and it's uses
- [PATCH] drm/core: Remove drm_dev_unref() and it's uses