drm/core: Remove drm_dev_unref() and it's uses
Subsystems (38)
PATCH 1/1 drm/core: Remove drm_dev_unref() and it's uses
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.
--- 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(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -2
@@ -647,7 +647,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, err_pci:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }
@@ -657,7 +657,7 @@ amdgpu_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_dev_unregister (dev); -drm_dev_unref (dev); +drm_dev_put (dev);pci_disable_device (pdev);pci_set_drvdata (pdev,NULL ); }
drivers/gpu/drm/arc/arcpgu_drv.c +2 -2
@@ -216,7 +216,7 @@ static int arcpgu_probe(struct platform_device *pdev)arcpgu_unload (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -227,7 +227,7 @@ static int arcpgu_remove(struct platform_device *pdev)drm_dev_unregister (drm);arcpgu_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }
drivers/gpu/drm/armada/armada_drv.c +3 -3
@@ -109,7 +109,7 @@ static int armada_drm_bind(struct device *dev)/* * The drm_device structure must be at the start of -* armada_private for drm_dev_unref() to work correctly. +* armada_private for drm_dev_put() to work correctly. */ BUILD_BUG_ON (offsetof(struct armada_private , drm) !=0 );
@@ -180,7 +180,7 @@ static int armada_drm_bind(struct device *dev)drm_mode_config_cleanup (&priv->drm);drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm);return ret; }
@@ -200,7 +200,7 @@ static void armada_drm_unbind(struct device *dev)drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm); }static int compare_of (struct device *dev,void *data)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +2 -2
@@ -774,7 +774,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)atmel_hlcdc_dc_unload (ddev); err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }
@@ -785,7 +785,7 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)drm_dev_unregister (ddev);atmel_hlcdc_dc_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }
drivers/gpu/drm/drm_drv.c +0 -13
@@ -656,19 +656,6 @@ void drm_dev_put(struct drm_device *dev) }EXPORT_SYMBOL (drm_dev_put); -/** -* drm_dev_unref - Drop reference of a DRM device -* @dev: device to drop reference of or NULL -* -* This is a compatibility alias for drm_dev_put() and should not be used by new -* code. -*/ -void drm_dev_unref (struct drm_device *dev) -{ -drm_dev_put (dev); -} -EXPORT_SYMBOL (drm_dev_unref); -static int create_compat_control_link (struct drm_device *dev) {struct drm_minor *minor;
drivers/gpu/drm/etnaviv/etnaviv_drv.c +2 -2
@@ -613,7 +613,7 @@ static int etnaviv_bind(struct device *dev) out_bind:kfree (priv); out_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -630,7 +630,7 @@ static void etnaviv_unbind(struct device *dev) drm->dev_private =NULL ;kfree (priv); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops etnaviv_master_ops = {
drivers/gpu/drm/exynos/exynos_drm_drv.c +2 -2
@@ -411,7 +411,7 @@ static int exynos_drm_bind(struct device *dev) err_free_private:kfree (private); err_free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -435,7 +435,7 @@ static void exynos_drm_unbind(struct device *dev) drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops exynos_drm_ops = {
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +2 -2
@@ -358,7 +358,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm); unregister_pix_clk:clk_unregister (fsl_dev->pix_clk); disable_clk:
@@ -371,7 +371,7 @@ static int fsl_dcu_drm_remove(struct platform_device *pdev)struct fsl_dcu_drm_device *fsl_dev =platform_get_drvdata (pdev);drm_dev_unregister (fsl_dev->drm); -drm_dev_unref (fsl_dev->drm); +drm_dev_put (fsl_dev->drm);clk_disable_unprepare (fsl_dev->clk);clk_unregister (fsl_dev->pix_clk);
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2 -2
@@ -387,7 +387,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, err_disable:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }
@@ -398,7 +398,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)drm_dev_unregister (dev);hibmc_unload (dev); -drm_dev_unref (dev); +drm_dev_put (dev); }static struct pci_device_id hibmc_pci_table[] = {
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +4 -4
@@ -193,7 +193,7 @@ static int kirin_drm_bind(struct device *dev) ret =kirin_drm_kms_init (drm_dev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =drm_dev_register (drm_dev,0 );if (ret)
@@ -203,8 +203,8 @@ static int kirin_drm_bind(struct device *dev) err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); -err_drm_dev_unref: -drm_dev_unref (drm_dev); +err_drm_dev_put: +drm_dev_put (drm_dev);return ret; }
@@ -215,7 +215,7 @@ static void kirin_drm_unbind(struct device *dev)drm_dev_unregister (drm_dev);kirin_drm_kms_cleanup (drm_dev); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct component_master_ops kirin_drm_ops = {
drivers/gpu/drm/i915/selftests/huge_pages.c +1 -1
@@ -1720,7 +1720,7 @@ int i915_gem_huge_page_mock_selftests(void) i915_modparams.enable_ppgtt = saved_ppgtt; -drm_dev_unref (&dev_priv->drm); +drm_dev_put (&dev_priv->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1 -1
@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1 -1
@@ -490,7 +490,7 @@ int i915_gem_evict_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
@@ -1646,7 +1646,7 @@ int i915_gem_gtt_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_gem_object.c +1 -1
@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_request.c +1 -1
@@ -262,7 +262,7 @@ int i915_request_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/i915_vma.c +1 -1
@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1 -1
@@ -463,7 +463,7 @@ int intel_breadcrumbs_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915->engine[RCS ]); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }
drivers/gpu/drm/imx/imx-drm-core.c +2 -2
@@ -307,7 +307,7 @@ static int imx_drm_bind(struct device *dev) err_kms:drm_mode_config_cleanup (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -327,7 +327,7 @@ static void imx_drm_unbind(struct device *dev)component_unbind_all (drm->dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops imx_drm_ops = {
drivers/gpu/drm/mediatek/mtk_drm_drv.c +3 -3
@@ -341,7 +341,7 @@ static int mtk_drm_bind(struct device *dev) err_deinit:mtk_drm_kms_deinit (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -350,7 +350,7 @@ static void mtk_drm_unbind(struct device *dev)struct mtk_drm_private *private =dev_get_drvdata (dev);drm_dev_unregister (private->drm); -drm_dev_unref (private->drm); +drm_dev_put (private->drm); private->drm =NULL ; }
@@ -504,7 +504,7 @@ static int mtk_drm_remove(struct platform_device *pdev)drm_dev_unregister (drm);mtk_drm_kms_deinit (drm); -drm_dev_unref (drm); +drm_dev_put (drm);component_master_del (&pdev->dev, &mtk_drm_ops);pm_runtime_disable (&pdev->dev);
drivers/gpu/drm/msm/msm_drv.c +4 -4
@@ -260,7 +260,7 @@ static int msm_drm_uninit(struct device *dev)msm_mdss_destroy (ddev); ddev->dev_private =NULL ; -drm_dev_unref (ddev); +drm_dev_put (ddev);kfree (priv);
@@ -368,7 +368,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -drm_dev_unref (ddev); +drm_dev_put (ddev);return -ENOMEM ; }
@@ -378,7 +378,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) ret =msm_mdss_init (ddev);if (ret) {kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }
@@ -398,7 +398,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)if (ret) {msm_mdss_destroy (ddev);kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }
drivers/gpu/drm/mxsfb/mxsfb_drv.c +2 -2
@@ -403,7 +403,7 @@ static int mxsfb_probe(struct platform_device *pdev) err_unload:mxsfb_unload (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -414,7 +414,7 @@ static int mxsfb_remove(struct platform_device *pdev)drm_dev_unregister (drm);mxsfb_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }
drivers/gpu/drm/nouveau/nouveau_platform.c +1 -1
@@ -36,7 +36,7 @@ static int nouveau_platform_probe(struct platform_device *pdev) ret =drm_dev_register (drm,0 );if (ret <0 ) { -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
drivers/gpu/drm/omapdrm/omap_drv.c +2 -2
@@ -598,7 +598,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)omap_drm_irq_uninstall (ddev); err_free_drm_dev:omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); err_destroy_wq:destroy_workqueue (priv->wq);omap_disconnect_dssdevs ();
@@ -627,7 +627,7 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)omap_drm_irq_uninstall (ddev);omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);destroy_workqueue (priv->wq);
drivers/gpu/drm/pl111/pl111_drv.c +2 -2
@@ -304,7 +304,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,return 0 ; dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -318,7 +318,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev)if (priv->panel)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }
drivers/gpu/drm/qxl/qxl_drv.c +1 -1
@@ -119,7 +119,7 @@ qxl_pci_remove(struct pci_dev *pdev) dev->dev_private =NULL ;kfree (qdev); -drm_dev_unref (dev); +drm_dev_put (dev); }static const struct file_operations qxl_fops = {
drivers/gpu/drm/rcar-du/rcar_du_drv.c +1 -1
@@ -378,7 +378,7 @@ static int rcar_du_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }
drivers/gpu/drm/rockchip/rockchip_drm_drv.c +2 -2
@@ -184,7 +184,7 @@ static int rockchip_drm_bind(struct device *dev) err_free: drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev);return ret; }
@@ -204,7 +204,7 @@ static void rockchip_drm_unbind(struct device *dev) drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct file_operations rockchip_drm_driver_fops = {
drivers/gpu/drm/shmobile/shmob_drm_drv.c +2 -2
@@ -198,7 +198,7 @@ static int shmob_drm_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev);drm_irq_uninstall (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }
@@ -294,7 +294,7 @@ static int shmob_drm_probe(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); err_free_drm_dev: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }
drivers/gpu/drm/sti/sti_drv.c +4 -4
@@ -242,7 +242,7 @@ static int sti_bind(struct device *dev) ret =sti_init (ddev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =component_bind_all (ddev->dev, ddev);if (ret)
@@ -266,8 +266,8 @@ static int sti_bind(struct device *dev)drm_mode_config_cleanup (ddev); err_cleanup:sti_cleanup (ddev); -err_drm_dev_unref: -drm_dev_unref (ddev); +err_drm_dev_put: +drm_dev_put (ddev);return ret; }
@@ -277,7 +277,7 @@ static void sti_unbind(struct device *dev)drm_dev_unregister (ddev);sti_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); }static const struct component_master_ops sti_ops = {
drivers/gpu/drm/stm/drv.c +2 -2
@@ -159,7 +159,7 @@ static int stm_drm_platform_probe(struct platform_device *pdev)return 0 ; err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }
@@ -172,7 +172,7 @@ static int stm_drm_platform_remove(struct platform_device *pdev)drm_dev_unregister (ddev);drv_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }
drivers/gpu/drm/sun4i/sun4i_drv.c +2 -2
@@ -143,7 +143,7 @@ static int sun4i_drv_bind(struct device *dev)drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -156,7 +156,7 @@ static void sun4i_drv_unbind(struct device *dev)sun4i_framebuffer_free (drm);drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops sun4i_drv_master_ops = {
drivers/gpu/drm/tegra/drm.c +2 -2
@@ -1210,7 +1210,7 @@ static int host1x_drm_probe(struct host1x_device *dev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm);return err; }
@@ -1219,7 +1219,7 @@ static int host1x_drm_remove(struct host1x_device *dev)struct drm_device *drm =dev_get_drvdata (&dev->dev);drm_dev_unregister (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }
drivers/gpu/drm/tinydrm/core/tinydrm-core.c +3 -3
@@ -135,7 +135,7 @@ static int tinydrm_init(struct device *parent, struct tinydrm_device *tdev,/* * We don't embed drm_device, because that prevent us from using * devm_kzalloc() to allocate tinydrm_device in the driver since -* drm_dev_unref() frees the structure. The devm_ functions provide +* drm_dev_put() frees the structure. The devm_ functions provide * for easy error handling. */ drm =drm_dev_alloc (driver, parent);
@@ -155,7 +155,7 @@ static void tinydrm_fini(struct tinydrm_device *tdev)drm_mode_config_cleanup (tdev->drm);mutex_destroy (&tdev->dirty_lock); tdev->drm->dev_private =NULL ; -drm_dev_unref (tdev->drm); +drm_dev_put (tdev->drm); }static void devm_tinydrm_release (void *data)
@@ -172,7 +172,7 @@ static void devm_tinydrm_release(void *data)* * This function initializes @tdev, the underlying DRM device and it's * mode_config. Resources will be automatically freed on driver detach (devres) -* using drm_mode_config_cleanup() and drm_dev_unref(). +* using drm_mode_config_cleanup() and drm_dev_put(). * * Returns: * Zero on success, negative error code on failure.
drivers/gpu/drm/tve200/tve200_drv.c +2 -2
@@ -250,7 +250,7 @@ static int tve200_probe(struct platform_device *pdev) clk_disable:clk_disable_unprepare (priv->pclk); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -265,7 +265,7 @@ static int tve200_remove(struct platform_device *pdev)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm);clk_disable_unprepare (priv->pclk); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }
drivers/gpu/drm/udl/udl_drv.c +1 -1
@@ -94,7 +94,7 @@ static int udl_usb_probe(struct usb_interface *interface,return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return r; }
drivers/gpu/drm/vc4/vc4_drv.c +2 -2
@@ -312,7 +312,7 @@ static int vc4_drm_bind(struct device *dev)vc4_gem_destroy (drm);vc4_bo_cache_destroy (drm); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -327,7 +327,7 @@ static void vc4_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops vc4_drm_ops = {
drivers/gpu/drm/vgem/vgem_drv.c +1 -1
@@ -505,7 +505,7 @@ static int __init vgem_init(void) static void __exit vgem_exit(void) {drm_dev_unregister (&vgem_device->drm); -drm_dev_unref (&vgem_device->drm); +drm_dev_put (&vgem_device->drm); }module_init (vgem_init);
drivers/gpu/drm/virtio/virtgpu_drm_bus.c +1 -1
@@ -85,6 +85,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }
drivers/gpu/drm/zte/zx_drm_drv.c +2 -2
@@ -122,7 +122,7 @@ static int zx_drm_bind(struct device *dev)component_unbind_all (dev, drm); out_unregister:dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }
@@ -136,7 +136,7 @@ static void zx_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm);component_unbind_all (dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops zx_drm_master_ops = {
include/drm/drm_drv.h +0 -1
@@ -622,7 +622,6 @@ void drm_dev_unregister(struct drm_device *dev);void drm_dev_get (struct drm_device *dev);void drm_dev_put (struct drm_device *dev); -void drm_dev_unref (struct drm_device *dev);void drm_put_dev (struct drm_device *dev);void drm_dev_unplug (struct drm_device *dev);
Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Hi Vaishali,
Thank you for the patch.
Quoted 9 lines · On Thursday, 26 April 2018 13:28:19 EEST 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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
I love seeing deprecated functions go.
Quoted 43 lines
--- 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(-)
Signature · 10 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Vaishali,
Thank you for the patch.
Quoted 9 lines · On Thursday, 26 April 2018 13:28:19 EEST 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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
I love seeing deprecated functions go.
Quoted 43 lines
--- 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(-)
Signature · 3 lines
Regards, Laurent Pinchart
Patchwork
CI✗ Fi.CI.BAT: failure for drm/core: Remove drm_dev_unref() and it's uses
In reply to Vaishali Thakkar== Series Details ==
== Series Details ==
Series: drm/core: Remove drm_dev_unref() and it's uses
URL : https://patchwork.freedesktop.org/series/42325/
State : failure
== Summary ==
Applying: drm/core: Remove drm_dev_unref() and it's uses
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_drv.c
M drivers/gpu/drm/exynos/exynos_drm_drv.c
M drivers/gpu/drm/mxsfb/mxsfb_drv.c
M drivers/gpu/drm/omapdrm/omap_drv.c
M drivers/gpu/drm/sti/sti_drv.c
M drivers/gpu/drm/stm/drv.c
M drivers/gpu/drm/tegra/drm.c
M drivers/gpu/drm/tinydrm/core/tinydrm-core.c
M drivers/gpu/drm/udl/udl_drv.c
M drivers/gpu/drm/vc4/vc4_drv.c
M include/drm/drm_drv.h
Falling back to patching base and 3-way merge... Auto-merging include/drm/drm_drv.h
Auto-merging drivers/gpu/drm/vc4/vc4_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_drv.c Auto-merging drivers/gpu/drm/udl/udl_drv.c
Auto-merging drivers/gpu/drm/tinydrm/core/tinydrm-core.c Auto-merging drivers/gpu/drm/tegra/drm.c
Auto-merging drivers/gpu/drm/stm/drv.c
Auto-merging drivers/gpu/drm/sti/sti_drv.c
Auto-merging drivers/gpu/drm/omapdrm/omap_drv.c
Auto-merging drivers/gpu/drm/mxsfb/mxsfb_drv.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c Auto-merging drivers/gpu/drm/drm_drv.c
Patch failed at 0001 drm/core: Remove drm_dev_unref() and it's uses The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
Yes, please.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
Yes, please.
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 6 lines · On Thu, 26 Apr 2018 15:58:19 +0530 Vaishali Thakkar <[email protected]>…
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()withdrm_dev_putand remove the function itself.
Quoted 8 lines
Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>--- 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 ++--
For atmel-hlcdc:
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
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.
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?
Thanks, Daniel
Quoted 885 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2
-2@@ -647,7 +647,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, err_pci:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }@@ -657,7 +657,7 @@ amdgpu_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_dev_unregister (dev); -drm_dev_unref (dev); +drm_dev_put (dev);pci_disable_device (pdev);pci_set_drvdata (pdev,NULL ); }drivers/gpu/drm/arc/arcpgu_drv.c +2
-2@@ -216,7 +216,7 @@ static int arcpgu_probe(struct platform_device *pdev)arcpgu_unload (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -227,7 +227,7 @@ static int arcpgu_remove(struct platform_device *pdev)drm_dev_unregister (drm);arcpgu_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/armada/armada_drv.c +3
-3@@ -109,7 +109,7 @@ static int armada_drm_bind(struct device *dev)/* * The drm_device structure must be at the start of -* armada_private for drm_dev_unref() to work correctly. +* armada_private for drm_dev_put() to work correctly. */ BUILD_BUG_ON (offsetof(struct armada_private , drm) !=0 );@@ -180,7 +180,7 @@ static int armada_drm_bind(struct device *dev)drm_mode_config_cleanup (&priv->drm);drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm);return ret; }@@ -200,7 +200,7 @@ static void armada_drm_unbind(struct device *dev)drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm); }static int compare_of (struct device *dev,void *data)drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +2
-2@@ -774,7 +774,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)atmel_hlcdc_dc_unload (ddev); err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -785,7 +785,7 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)drm_dev_unregister (ddev);atmel_hlcdc_dc_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/drm_drv.c +0
-13@@ -656,19 +656,6 @@ void drm_dev_put(struct drm_device *dev) }EXPORT_SYMBOL (drm_dev_put); -/** -* drm_dev_unref - Drop reference of a DRM device -* @dev: device to drop reference of or NULL -* -* This is a compatibility alias for drm_dev_put() and should not be used by new -* code. -*/ -void drm_dev_unref (struct drm_device *dev) -{ -drm_dev_put (dev); -} -EXPORT_SYMBOL (drm_dev_unref); -static int create_compat_control_link (struct drm_device *dev) {struct drm_minor *minor;drivers/gpu/drm/etnaviv/etnaviv_drv.c +2
-2@@ -613,7 +613,7 @@ static int etnaviv_bind(struct device *dev) out_bind:kfree (priv); out_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -630,7 +630,7 @@ static void etnaviv_unbind(struct device *dev) drm->dev_private =NULL ;kfree (priv); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops etnaviv_master_ops = {drivers/gpu/drm/exynos/exynos_drm_drv.c +2
-2@@ -411,7 +411,7 @@ static int exynos_drm_bind(struct device *dev) err_free_private:kfree (private); err_free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -435,7 +435,7 @@ static void exynos_drm_unbind(struct device *dev) drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops exynos_drm_ops = {drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +2
-2@@ -358,7 +358,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm); unregister_pix_clk:clk_unregister (fsl_dev->pix_clk); disable_clk:@@ -371,7 +371,7 @@ static int fsl_dcu_drm_remove(struct platform_device *pdev)struct fsl_dcu_drm_device *fsl_dev =platform_get_drvdata (pdev);drm_dev_unregister (fsl_dev->drm); -drm_dev_unref (fsl_dev->drm); +drm_dev_put (fsl_dev->drm);clk_disable_unprepare (fsl_dev->clk);clk_unregister (fsl_dev->pix_clk);drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2
-2@@ -387,7 +387,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, err_disable:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }@@ -398,7 +398,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)drm_dev_unregister (dev);hibmc_unload (dev); -drm_dev_unref (dev); +drm_dev_put (dev); }static struct pci_device_id hibmc_pci_table[] = {drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +4
-4@@ -193,7 +193,7 @@ static int kirin_drm_bind(struct device *dev) ret =kirin_drm_kms_init (drm_dev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =drm_dev_register (drm_dev,0 );if (ret)@@ -203,8 +203,8 @@ static int kirin_drm_bind(struct device *dev) err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); -err_drm_dev_unref: -drm_dev_unref (drm_dev); +err_drm_dev_put: +drm_dev_put (drm_dev);return ret; }@@ -215,7 +215,7 @@ static void kirin_drm_unbind(struct device *dev)drm_dev_unregister (drm_dev);kirin_drm_kms_cleanup (drm_dev); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct component_master_ops kirin_drm_ops = {drivers/gpu/drm/i915/selftests/huge_pages.c +1
-1@@ -1720,7 +1720,7 @@ int i915_gem_huge_page_mock_selftests(void) i915_modparams.enable_ppgtt = saved_ppgtt; -drm_dev_unref (&dev_priv->drm); +drm_dev_put (&dev_priv->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1
-1@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1
-1@@ -490,7 +490,7 @@ int i915_gem_evict_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1
-1@@ -1646,7 +1646,7 @@ int i915_gem_gtt_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_object.c +1
-1@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_request.c +1
-1@@ -262,7 +262,7 @@ int i915_request_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_vma.c +1
-1@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1
-1@@ -463,7 +463,7 @@ int intel_breadcrumbs_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915->engine[RCS ]); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/imx/imx-drm-core.c +2
-2@@ -307,7 +307,7 @@ static int imx_drm_bind(struct device *dev) err_kms:drm_mode_config_cleanup (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -327,7 +327,7 @@ static void imx_drm_unbind(struct device *dev)component_unbind_all (drm->dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops imx_drm_ops = {drivers/gpu/drm/mediatek/mtk_drm_drv.c +3
-3@@ -341,7 +341,7 @@ static int mtk_drm_bind(struct device *dev) err_deinit:mtk_drm_kms_deinit (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -350,7 +350,7 @@ static void mtk_drm_unbind(struct device *dev)struct mtk_drm_private *private =dev_get_drvdata (dev);drm_dev_unregister (private->drm); -drm_dev_unref (private->drm); +drm_dev_put (private->drm); private->drm =NULL ; }@@ -504,7 +504,7 @@ static int mtk_drm_remove(struct platform_device *pdev)drm_dev_unregister (drm);mtk_drm_kms_deinit (drm); -drm_dev_unref (drm); +drm_dev_put (drm);component_master_del (&pdev->dev, &mtk_drm_ops);pm_runtime_disable (&pdev->dev);drivers/gpu/drm/msm/msm_drv.c +4
-4@@ -260,7 +260,7 @@ static int msm_drm_uninit(struct device *dev)msm_mdss_destroy (ddev); ddev->dev_private =NULL ; -drm_dev_unref (ddev); +drm_dev_put (ddev);kfree (priv);@@ -368,7 +368,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -drm_dev_unref (ddev); +drm_dev_put (ddev);return -ENOMEM ; }@@ -378,7 +378,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) ret =msm_mdss_init (ddev);if (ret) {kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -398,7 +398,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)if (ret) {msm_mdss_destroy (ddev);kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }drivers/gpu/drm/mxsfb/mxsfb_drv.c +2
-2@@ -403,7 +403,7 @@ static int mxsfb_probe(struct platform_device *pdev) err_unload:mxsfb_unload (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -414,7 +414,7 @@ static int mxsfb_remove(struct platform_device *pdev)drm_dev_unregister (drm);mxsfb_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/nouveau/nouveau_platform.c +1
-1@@ -36,7 +36,7 @@ static int nouveau_platform_probe(struct platform_device *pdev) ret =drm_dev_register (drm,0 );if (ret <0 ) { -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }drivers/gpu/drm/omapdrm/omap_drv.c +2
-2@@ -598,7 +598,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)omap_drm_irq_uninstall (ddev); err_free_drm_dev:omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); err_destroy_wq:destroy_workqueue (priv->wq);omap_disconnect_dssdevs ();@@ -627,7 +627,7 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)omap_drm_irq_uninstall (ddev);omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);destroy_workqueue (priv->wq);drivers/gpu/drm/pl111/pl111_drv.c +2
-2@@ -304,7 +304,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,return 0 ; dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -318,7 +318,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev)if (priv->panel)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/qxl/qxl_drv.c +1
-1@@ -119,7 +119,7 @@ qxl_pci_remove(struct pci_dev *pdev) dev->dev_private =NULL ;kfree (qdev); -drm_dev_unref (dev); +drm_dev_put (dev); }static const struct file_operations qxl_fops = {drivers/gpu/drm/rcar-du/rcar_du_drv.c +1
-1@@ -378,7 +378,7 @@ static int rcar_du_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/rockchip/rockchip_drm_drv.c +2
-2@@ -184,7 +184,7 @@ static int rockchip_drm_bind(struct device *dev) err_free: drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev);return ret; }@@ -204,7 +204,7 @@ static void rockchip_drm_unbind(struct device *dev) drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct file_operations rockchip_drm_driver_fops = {drivers/gpu/drm/shmobile/shmob_drm_drv.c +2
-2@@ -198,7 +198,7 @@ static int shmob_drm_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev);drm_irq_uninstall (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }@@ -294,7 +294,7 @@ static int shmob_drm_probe(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); err_free_drm_dev: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }drivers/gpu/drm/sti/sti_drv.c +4
-4@@ -242,7 +242,7 @@ static int sti_bind(struct device *dev) ret =sti_init (ddev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =component_bind_all (ddev->dev, ddev);if (ret)@@ -266,8 +266,8 @@ static int sti_bind(struct device *dev)drm_mode_config_cleanup (ddev); err_cleanup:sti_cleanup (ddev); -err_drm_dev_unref: -drm_dev_unref (ddev); +err_drm_dev_put: +drm_dev_put (ddev);return ret; }@@ -277,7 +277,7 @@ static void sti_unbind(struct device *dev)drm_dev_unregister (ddev);sti_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); }static const struct component_master_ops sti_ops = {drivers/gpu/drm/stm/drv.c +2
-2@@ -159,7 +159,7 @@ static int stm_drm_platform_probe(struct platform_device *pdev)return 0 ; err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -172,7 +172,7 @@ static int stm_drm_platform_remove(struct platform_device *pdev)drm_dev_unregister (ddev);drv_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/sun4i/sun4i_drv.c +2
-2@@ -143,7 +143,7 @@ static int sun4i_drv_bind(struct device *dev)drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -156,7 +156,7 @@ static void sun4i_drv_unbind(struct device *dev)sun4i_framebuffer_free (drm);drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops sun4i_drv_master_ops = {drivers/gpu/drm/tegra/drm.c +2
-2@@ -1210,7 +1210,7 @@ static int host1x_drm_probe(struct host1x_device *dev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm);return err; }@@ -1219,7 +1219,7 @@ static int host1x_drm_remove(struct host1x_device *dev)struct drm_device *drm =dev_get_drvdata (&dev->dev);drm_dev_unregister (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/tinydrm/core/tinydrm-core.c +3
-3@@ -135,7 +135,7 @@ static int tinydrm_init(struct device *parent, struct tinydrm_device *tdev,/* * We don't embed drm_device, because that prevent us from using * devm_kzalloc() to allocate tinydrm_device in the driver since -* drm_dev_unref() frees the structure. The devm_ functions provide +* drm_dev_put() frees the structure. The devm_ functions provide * for easy error handling. */ drm =drm_dev_alloc (driver, parent);@@ -155,7 +155,7 @@ static void tinydrm_fini(struct tinydrm_device *tdev)drm_mode_config_cleanup (tdev->drm);mutex_destroy (&tdev->dirty_lock); tdev->drm->dev_private =NULL ; -drm_dev_unref (tdev->drm); +drm_dev_put (tdev->drm); }static void devm_tinydrm_release (void *data)@@ -172,7 +172,7 @@ static void devm_tinydrm_release(void *data)* * This function initializes @tdev, the underlying DRM device and it's * mode_config. Resources will be automatically freed on driver detach (devres) -* using drm_mode_config_cleanup() and drm_dev_unref(). +* using drm_mode_config_cleanup() and drm_dev_put(). * * Returns: * Zero on success, negative error code on failure. drivers/gpu/drm/tve200/tve200_drv.c +2
-2@@ -250,7 +250,7 @@ static int tve200_probe(struct platform_device *pdev) clk_disable:clk_disable_unprepare (priv->pclk); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -265,7 +265,7 @@ static int tve200_remove(struct platform_device *pdev)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm);clk_disable_unprepare (priv->pclk); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/udl/udl_drv.c +1
-1@@ -94,7 +94,7 @@ static int udl_usb_probe(struct usb_interface *interface,return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return r; }drivers/gpu/drm/vc4/vc4_drv.c +2
-2@@ -312,7 +312,7 @@ static int vc4_drm_bind(struct device *dev)vc4_gem_destroy (drm);vc4_bo_cache_destroy (drm); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -327,7 +327,7 @@ static void vc4_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops vc4_drm_ops = {drivers/gpu/drm/vgem/vgem_drv.c +1
-1@@ -505,7 +505,7 @@ static int __init vgem_init(void) static void __exit vgem_exit(void) {drm_dev_unregister (&vgem_device->drm); -drm_dev_unref (&vgem_device->drm); +drm_dev_put (&vgem_device->drm); }module_init (vgem_init);drivers/gpu/drm/virtio/virtgpu_drm_bus.c +1
-1@@ -85,6 +85,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }drivers/gpu/drm/zte/zx_drm_drv.c +2
-2@@ -122,7 +122,7 @@ static int zx_drm_bind(struct device *dev)component_unbind_all (dev, drm); out_unregister:dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -136,7 +136,7 @@ static void zx_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm);component_unbind_all (dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops zx_drm_master_ops = {include/drm/drm_drv.h +0
-1@@ -622,7 +622,6 @@ void drm_dev_unregister(struct drm_device *dev);void drm_dev_get (struct drm_device *dev);void drm_dev_put (struct drm_device *dev); -void drm_dev_unref (struct drm_device *dev);void drm_put_dev (struct drm_device *dev);void drm_dev_unplug (struct drm_device *dev);Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20180426123615.GA12521-dv86pmgwkMBes7Z6vYuT8azUEOm+Xw19@public.gmane.org
Hi Daniel,
Quoted 11 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
Quoted 7 lines
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.
Quoted 2 lines
Also can you pls update
./scripts/coccinelle/api/drm-get-put.cocciand 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.
Quoted 44 lines
Quoted 44 lines
---
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(-)
Signature · 10 lines
Regards, Laurent Pinchart _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 25 lines · Laurent Pinchart
Hi Daniel,
Quoted 11 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>Quoted 7 lines
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.
Quoted 6 lines
Quoted 2 lines
Also can you pls update
./scripts/coccinelle/api/drm-get-put.cocciand 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!
Quoted 52 lines
Quoted 36 lines
Quoted 36 lines
---
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 +++---Quoted 8 lines
Quoted 8 lines
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
Signature · 6 lines
Vaishali http://vaishalithakkar.in/ _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alexandre Belloni
maintainerHi,
Quoted 18 lines · Laurent Pinchart
Hi Daniel,
Quoted 15 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>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 :-/
Quoted 7 lines
Quoted 3 lines
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?
Signature · 3 lines
Alexandre Belloni, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 25 lines · Alexandre Belloni
Hi,
Quoted 22 lines · Laurent Pinchart
Hi Daniel,
Quoted 18 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>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.
Quoted 7 lines
Quoted 3 lines
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.his 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
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 25 lines · Alexandre Belloni
Hi,
Quoted 22 lines · Laurent Pinchart
Hi Daniel,
Quoted 18 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>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.
Quoted 7 lines
Quoted 3 lines
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.his 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
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi Daniel,
Quoted 11 lines · On Thursday, 26 April 2018 15:36:15 EEST Daniel Vetter wrote:
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
Quoted 7 lines
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.
Quoted 2 lines
Also can you pls update
./scripts/coccinelle/api/drm-get-put.cocciand 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.
Quoted 44 lines
Quoted 44 lines
---
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(-)
Signature · 3 lines
Regards, Laurent Pinchart
Quoted 9 lines · Vaishali Thakkar
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()withdrm_dev_putand remove the function itself.Coccinelle was used for mass-patching.
Signed-off-by Vaishali Thakkar <[email protected]>
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.
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?
Thanks, Daniel
Quoted 885 lines
--- 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(-)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2
-2@@ -647,7 +647,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, err_pci:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }@@ -657,7 +657,7 @@ amdgpu_pci_remove(struct pci_dev *pdev)struct drm_device *dev =pci_get_drvdata (pdev);drm_dev_unregister (dev); -drm_dev_unref (dev); +drm_dev_put (dev);pci_disable_device (pdev);pci_set_drvdata (pdev,NULL ); }drivers/gpu/drm/arc/arcpgu_drv.c +2
-2@@ -216,7 +216,7 @@ static int arcpgu_probe(struct platform_device *pdev)arcpgu_unload (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -227,7 +227,7 @@ static int arcpgu_remove(struct platform_device *pdev)drm_dev_unregister (drm);arcpgu_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/armada/armada_drv.c +3
-3@@ -109,7 +109,7 @@ static int armada_drm_bind(struct device *dev)/* * The drm_device structure must be at the start of -* armada_private for drm_dev_unref() to work correctly. +* armada_private for drm_dev_put() to work correctly. */ BUILD_BUG_ON (offsetof(struct armada_private , drm) !=0 );@@ -180,7 +180,7 @@ static int armada_drm_bind(struct device *dev)drm_mode_config_cleanup (&priv->drm);drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm);return ret; }@@ -200,7 +200,7 @@ static void armada_drm_unbind(struct device *dev)drm_mm_takedown (&priv->linear);flush_work (&priv->fb_unref_work); -drm_dev_unref (&priv->drm); +drm_dev_put (&priv->drm); }static int compare_of (struct device *dev,void *data)drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +2
-2@@ -774,7 +774,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev)atmel_hlcdc_dc_unload (ddev); err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -785,7 +785,7 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)drm_dev_unregister (ddev);atmel_hlcdc_dc_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/drm_drv.c +0
-13@@ -656,19 +656,6 @@ void drm_dev_put(struct drm_device *dev) }EXPORT_SYMBOL (drm_dev_put); -/** -* drm_dev_unref - Drop reference of a DRM device -* @dev: device to drop reference of or NULL -* -* This is a compatibility alias for drm_dev_put() and should not be used by new -* code. -*/ -void drm_dev_unref (struct drm_device *dev) -{ -drm_dev_put (dev); -} -EXPORT_SYMBOL (drm_dev_unref); -static int create_compat_control_link (struct drm_device *dev) {struct drm_minor *minor;drivers/gpu/drm/etnaviv/etnaviv_drv.c +2
-2@@ -613,7 +613,7 @@ static int etnaviv_bind(struct device *dev) out_bind:kfree (priv); out_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -630,7 +630,7 @@ static void etnaviv_unbind(struct device *dev) drm->dev_private =NULL ;kfree (priv); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops etnaviv_master_ops = {drivers/gpu/drm/exynos/exynos_drm_drv.c +2
-2@@ -411,7 +411,7 @@ static int exynos_drm_bind(struct device *dev) err_free_private:kfree (private); err_free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -435,7 +435,7 @@ static void exynos_drm_unbind(struct device *dev) drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops exynos_drm_ops = {drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +2
-2@@ -358,7 +358,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm); unregister_pix_clk:clk_unregister (fsl_dev->pix_clk); disable_clk:@@ -371,7 +371,7 @@ static int fsl_dcu_drm_remove(struct platform_device *pdev)struct fsl_dcu_drm_device *fsl_dev =platform_get_drvdata (pdev);drm_dev_unregister (fsl_dev->drm); -drm_dev_unref (fsl_dev->drm); +drm_dev_put (fsl_dev->drm);clk_disable_unprepare (fsl_dev->clk);clk_unregister (fsl_dev->pix_clk);drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2
-2@@ -387,7 +387,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, err_disable:pci_disable_device (pdev); err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }@@ -398,7 +398,7 @@ static void hibmc_pci_remove(struct pci_dev *pdev)drm_dev_unregister (dev);hibmc_unload (dev); -drm_dev_unref (dev); +drm_dev_put (dev); }static struct pci_device_id hibmc_pci_table[] = {drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +4
-4@@ -193,7 +193,7 @@ static int kirin_drm_bind(struct device *dev) ret =kirin_drm_kms_init (drm_dev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =drm_dev_register (drm_dev,0 );if (ret)@@ -203,8 +203,8 @@ static int kirin_drm_bind(struct device *dev) err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); -err_drm_dev_unref: -drm_dev_unref (drm_dev); +err_drm_dev_put: +drm_dev_put (drm_dev);return ret; }@@ -215,7 +215,7 @@ static void kirin_drm_unbind(struct device *dev)drm_dev_unregister (drm_dev);kirin_drm_kms_cleanup (drm_dev); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct component_master_ops kirin_drm_ops = {drivers/gpu/drm/i915/selftests/huge_pages.c +1
-1@@ -1720,7 +1720,7 @@ int i915_gem_huge_page_mock_selftests(void) i915_modparams.enable_ppgtt = saved_ppgtt; -drm_dev_unref (&dev_priv->drm); +drm_dev_put (&dev_priv->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c +1
-1@@ -389,7 +389,7 @@ int i915_gem_dmabuf_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_evict.c +1
-1@@ -490,7 +490,7 @@ int i915_gem_evict_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1
-1@@ -1646,7 +1646,7 @@ int i915_gem_gtt_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_gem_object.c +1
-1@@ -586,7 +586,7 @@ int i915_gem_object_mock_selftests(void) err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_request.c +1
-1@@ -262,7 +262,7 @@ int i915_request_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/i915_vma.c +1
-1@@ -734,7 +734,7 @@ int i915_vma_mock_selftests(void) err =i915_subtests (tests, i915);mutex_unlock (&i915->drm.struct_mutex); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c +1
-1@@ -463,7 +463,7 @@ int intel_breadcrumbs_mock_selftests(void)return -ENOMEM ; err =i915_subtests (tests, i915->engine[RCS ]); -drm_dev_unref (&i915->drm); +drm_dev_put (&i915->drm);return err; }drivers/gpu/drm/imx/imx-drm-core.c +2
-2@@ -307,7 +307,7 @@ static int imx_drm_bind(struct device *dev) err_kms:drm_mode_config_cleanup (drm); err_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -327,7 +327,7 @@ static void imx_drm_unbind(struct device *dev)component_unbind_all (drm->dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops imx_drm_ops = {drivers/gpu/drm/mediatek/mtk_drm_drv.c +3
-3@@ -341,7 +341,7 @@ static int mtk_drm_bind(struct device *dev) err_deinit:mtk_drm_kms_deinit (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -350,7 +350,7 @@ static void mtk_drm_unbind(struct device *dev)struct mtk_drm_private *private =dev_get_drvdata (dev);drm_dev_unregister (private->drm); -drm_dev_unref (private->drm); +drm_dev_put (private->drm); private->drm =NULL ; }@@ -504,7 +504,7 @@ static int mtk_drm_remove(struct platform_device *pdev)drm_dev_unregister (drm);mtk_drm_kms_deinit (drm); -drm_dev_unref (drm); +drm_dev_put (drm);component_master_del (&pdev->dev, &mtk_drm_ops);pm_runtime_disable (&pdev->dev);drivers/gpu/drm/msm/msm_drv.c +4
-4@@ -260,7 +260,7 @@ static int msm_drm_uninit(struct device *dev)msm_mdss_destroy (ddev); ddev->dev_private =NULL ; -drm_dev_unref (ddev); +drm_dev_put (ddev);kfree (priv);@@ -368,7 +368,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) priv =kzalloc (sizeof (*priv),GFP_KERNEL );if (!priv) { -drm_dev_unref (ddev); +drm_dev_put (ddev);return -ENOMEM ; }@@ -378,7 +378,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) ret =msm_mdss_init (ddev);if (ret) {kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -398,7 +398,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)if (ret) {msm_mdss_destroy (ddev);kfree (priv); -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }drivers/gpu/drm/mxsfb/mxsfb_drv.c +2
-2@@ -403,7 +403,7 @@ static int mxsfb_probe(struct platform_device *pdev) err_unload:mxsfb_unload (drm); err_free: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -414,7 +414,7 @@ static int mxsfb_remove(struct platform_device *pdev)drm_dev_unregister (drm);mxsfb_unload (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/nouveau/nouveau_platform.c +1
-1@@ -36,7 +36,7 @@ static int nouveau_platform_probe(struct platform_device *pdev) ret =drm_dev_register (drm,0 );if (ret <0 ) { -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }drivers/gpu/drm/omapdrm/omap_drv.c +2
-2@@ -598,7 +598,7 @@ static int omapdrm_init(struct omap_drm_private *priv, struct device *dev)omap_drm_irq_uninstall (ddev); err_free_drm_dev:omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); err_destroy_wq:destroy_workqueue (priv->wq);omap_disconnect_dssdevs ();@@ -627,7 +627,7 @@ static void omapdrm_cleanup(struct omap_drm_private *priv)omap_drm_irq_uninstall (ddev);omap_gem_deinit (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);destroy_workqueue (priv->wq);drivers/gpu/drm/pl111/pl111_drv.c +2
-2@@ -304,7 +304,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,return 0 ; dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -318,7 +318,7 @@ static int pl111_amba_remove(struct amba_device *amba_dev)if (priv->panel)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/qxl/qxl_drv.c +1
-1@@ -119,7 +119,7 @@ qxl_pci_remove(struct pci_dev *pdev) dev->dev_private =NULL ;kfree (qdev); -drm_dev_unref (dev); +drm_dev_put (dev); }static const struct file_operations qxl_fops = {drivers/gpu/drm/rcar-du/rcar_du_drv.c +1
-1@@ -378,7 +378,7 @@ static int rcar_du_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/rockchip/rockchip_drm_drv.c +2
-2@@ -184,7 +184,7 @@ static int rockchip_drm_bind(struct device *dev) err_free: drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev);return ret; }@@ -204,7 +204,7 @@ static void rockchip_drm_unbind(struct device *dev) drm_dev->dev_private =NULL ;dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev); }static const struct file_operations rockchip_drm_driver_fops = {drivers/gpu/drm/shmobile/shmob_drm_drv.c +2
-2@@ -198,7 +198,7 @@ static int shmob_drm_remove(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev);drm_irq_uninstall (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }@@ -294,7 +294,7 @@ static int shmob_drm_probe(struct platform_device *pdev)drm_kms_helper_poll_fini (ddev);drm_mode_config_cleanup (ddev); err_free_drm_dev: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }drivers/gpu/drm/sti/sti_drv.c +4
-4@@ -242,7 +242,7 @@ static int sti_bind(struct device *dev) ret =sti_init (ddev);if (ret) - goto err_drm_dev_unref; + goto err_drm_dev_put; ret =component_bind_all (ddev->dev, ddev);if (ret)@@ -266,8 +266,8 @@ static int sti_bind(struct device *dev)drm_mode_config_cleanup (ddev); err_cleanup:sti_cleanup (ddev); -err_drm_dev_unref: -drm_dev_unref (ddev); +err_drm_dev_put: +drm_dev_put (ddev);return ret; }@@ -277,7 +277,7 @@ static void sti_unbind(struct device *dev)drm_dev_unregister (ddev);sti_cleanup (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev); }static const struct component_master_ops sti_ops = {drivers/gpu/drm/stm/drv.c +2
-2@@ -159,7 +159,7 @@ static int stm_drm_platform_probe(struct platform_device *pdev)return 0 ; err_unref: -drm_dev_unref (ddev); +drm_dev_put (ddev);return ret; }@@ -172,7 +172,7 @@ static int stm_drm_platform_remove(struct platform_device *pdev)drm_dev_unregister (ddev);drv_unload (ddev); -drm_dev_unref (ddev); +drm_dev_put (ddev);return 0 ; }drivers/gpu/drm/sun4i/sun4i_drv.c +2
-2@@ -143,7 +143,7 @@ static int sun4i_drv_bind(struct device *dev)drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); free_drm: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -156,7 +156,7 @@ static void sun4i_drv_unbind(struct device *dev)sun4i_framebuffer_free (drm);drm_mode_config_cleanup (drm);of_reserved_mem_device_release (dev); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops sun4i_drv_master_ops = {drivers/gpu/drm/tegra/drm.c +2
-2@@ -1210,7 +1210,7 @@ static int host1x_drm_probe(struct host1x_device *dev)return 0 ; unref: -drm_dev_unref (drm); +drm_dev_put (drm);return err; }@@ -1219,7 +1219,7 @@ static int host1x_drm_remove(struct host1x_device *dev)struct drm_device *drm =dev_get_drvdata (&dev->dev);drm_dev_unregister (drm); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/tinydrm/core/tinydrm-core.c +3
-3@@ -135,7 +135,7 @@ static int tinydrm_init(struct device *parent, struct tinydrm_device *tdev,/* * We don't embed drm_device, because that prevent us from using * devm_kzalloc() to allocate tinydrm_device in the driver since -* drm_dev_unref() frees the structure. The devm_ functions provide +* drm_dev_put() frees the structure. The devm_ functions provide * for easy error handling. */ drm =drm_dev_alloc (driver, parent);@@ -155,7 +155,7 @@ static void tinydrm_fini(struct tinydrm_device *tdev)drm_mode_config_cleanup (tdev->drm);mutex_destroy (&tdev->dirty_lock); tdev->drm->dev_private =NULL ; -drm_dev_unref (tdev->drm); +drm_dev_put (tdev->drm); }static void devm_tinydrm_release (void *data)@@ -172,7 +172,7 @@ static void devm_tinydrm_release(void *data)* * This function initializes @tdev, the underlying DRM device and it's * mode_config. Resources will be automatically freed on driver detach (devres) -* using drm_mode_config_cleanup() and drm_dev_unref(). +* using drm_mode_config_cleanup() and drm_dev_put(). * * Returns: * Zero on success, negative error code on failure. drivers/gpu/drm/tve200/tve200_drv.c +2
-2@@ -250,7 +250,7 @@ static int tve200_probe(struct platform_device *pdev) clk_disable:clk_disable_unprepare (priv->pclk); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -265,7 +265,7 @@ static int tve200_remove(struct platform_device *pdev)drm_panel_bridge_remove (priv->bridge);drm_mode_config_cleanup (drm);clk_disable_unprepare (priv->pclk); -drm_dev_unref (drm); +drm_dev_put (drm);return 0 ; }drivers/gpu/drm/udl/udl_drv.c +1
-1@@ -94,7 +94,7 @@ static int udl_usb_probe(struct usb_interface *interface,return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return r; }drivers/gpu/drm/vc4/vc4_drv.c +2
-2@@ -312,7 +312,7 @@ static int vc4_drm_bind(struct device *dev)vc4_gem_destroy (drm);vc4_bo_cache_destroy (drm); dev_unref: -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -327,7 +327,7 @@ static void vc4_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops vc4_drm_ops = {drivers/gpu/drm/vgem/vgem_drv.c +1
-1@@ -505,7 +505,7 @@ static int __init vgem_init(void) static void __exit vgem_exit(void) {drm_dev_unregister (&vgem_device->drm); -drm_dev_unref (&vgem_device->drm); +drm_dev_put (&vgem_device->drm); }module_init (vgem_init);drivers/gpu/drm/virtio/virtgpu_drm_bus.c +1
-1@@ -85,6 +85,6 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)return 0 ; err_free: -drm_dev_unref (dev); +drm_dev_put (dev);return ret; }drivers/gpu/drm/zte/zx_drm_drv.c +2
-2@@ -122,7 +122,7 @@ static int zx_drm_bind(struct device *dev)component_unbind_all (dev, drm); out_unregister:dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm);return ret; }@@ -136,7 +136,7 @@ static void zx_drm_unbind(struct device *dev)drm_mode_config_cleanup (drm);component_unbind_all (dev, drm);dev_set_drvdata (dev,NULL ); -drm_dev_unref (drm); +drm_dev_put (drm); }static const struct component_master_ops zx_drm_master_ops = {include/drm/drm_drv.h +0
-1@@ -622,7 +622,6 @@ void drm_dev_unregister(struct drm_device *dev);void drm_dev_get (struct drm_device *dev);void drm_dev_put (struct drm_device *dev); -void drm_dev_unref (struct drm_device *dev);void drm_put_dev (struct drm_device *dev);void drm_dev_unplug (struct drm_device *dev);Signature · 6 lines
2.14.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch