| Message ID | 20181115221634.22715-4-greenfoo@gluegarage.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: remove deprecated functions | expand |
On Thu, 15 Nov 2018 23:16:23 +0100 Fernando Ramos <greenfoo@gluegarage.com> wrote: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > --- > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- For the Atmel HLCDC driver Acked-by: Boris Brezillon <boris.brezillon@bootlin.com> > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- > 8 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c > index f067de4e1e82..dcb06d4e9135 100644 > --- a/drivers/gpu/drm/arc/arcpgu_drv.c > +++ b/drivers/gpu/drm/arc/arcpgu_drv.c > @@ -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; > } > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 843cac222e60..f8da51a63e2f 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -775,7 +775,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; > } > @@ -786,7 +786,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; > } > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > index 83c1f46670bf..52802e6049e0 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > @@ -550,7 +550,7 @@ static int etnaviv_bind(struct device *dev) > out_bind: > kfree(priv); > out_unref: > - drm_dev_unref(drm); > + drm_dev_put(drm); > > return ret; > } > @@ -567,7 +567,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 = { > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > index 2393e6d16ffd..88ba003979e6 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > @@ -417,7 +417,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; > } > @@ -428,7 +428,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; > } > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > index 084f58df4a8c..c7fe2433ab9e 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > @@ -454,7 +454,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; > } > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > index 6ececad6f845..8554102a6ead 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > @@ -194,7 +194,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; > } > @@ -290,7 +290,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; > } > diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c > index 72efcecb44f7..28e2d03c0ccf 100644 > --- a/drivers/gpu/drm/tve200/tve200_drv.c > +++ b/drivers/gpu/drm/tve200/tve200_drv.c > @@ -249,7 +249,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; > } > > @@ -263,7 +263,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; > } > diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c > index 11ef17c2d1c1..5b6f1eda52e0 100644 > --- a/drivers/gpu/drm/zte/zx_drm_drv.c > +++ b/drivers/gpu/drm/zte/zx_drm_drv.c > @@ -114,7 +114,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; > } > > @@ -127,7 +127,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 = {
Am Donnerstag, den 15.11.2018, 23:16 +0100 schrieb Fernando Ramos: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > --- > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- At least the etnaviv part of the patch is already fixed in linux-next. Regards, Lucas > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- > 8 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c > index f067de4e1e82..dcb06d4e9135 100644 > --- a/drivers/gpu/drm/arc/arcpgu_drv.c > +++ b/drivers/gpu/drm/arc/arcpgu_drv.c > @@ -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; > } > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 843cac222e60..f8da51a63e2f 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -775,7 +775,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; > } > @@ -786,7 +786,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; > } > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > index 83c1f46670bf..52802e6049e0 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > @@ -550,7 +550,7 @@ static int etnaviv_bind(struct device *dev) > out_bind: > > kfree(priv); > out_unref: > > - drm_dev_unref(drm); > > + drm_dev_put(drm); > > > return ret; > } > @@ -567,7 +567,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 = { > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > index 2393e6d16ffd..88ba003979e6 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > @@ -417,7 +417,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; > } > @@ -428,7 +428,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; > } > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > index 084f58df4a8c..c7fe2433ab9e 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > @@ -454,7 +454,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; > } > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > index 6ececad6f845..8554102a6ead 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > @@ -194,7 +194,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; > } > @@ -290,7 +290,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; > } > diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c > index 72efcecb44f7..28e2d03c0ccf 100644 > --- a/drivers/gpu/drm/tve200/tve200_drv.c > +++ b/drivers/gpu/drm/tve200/tve200_drv.c > @@ -249,7 +249,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; > } > > @@ -263,7 +263,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; > } > diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c > index 11ef17c2d1c1..5b6f1eda52e0 100644 > --- a/drivers/gpu/drm/zte/zx_drm_drv.c > +++ b/drivers/gpu/drm/zte/zx_drm_drv.c > @@ -114,7 +114,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; > } > > @@ -127,7 +127,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 = {
Hi Fernando, On Thu, 2018-11-15 at 23:16 +0100, Fernando Ramos wrote: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > --- > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- For ARCPGU Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
On Fri, Nov 16, 2018, at 11:15 AM, Lucas Stach wrote: > Am Donnerstag, den 15.11.2018, 23:16 +0100 schrieb Fernando Ramos: > > This patch unifies the naming of DRM functions for reference counting as > > requested on Documentation/gpu/todo.rst > > > > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > > --- > > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- > > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- > > At least the etnaviv part of the patch is already fixed in linux-next. > > Regards, > Lucas Thanks for the notice. I'm new on this, how should I proceed? Should I create a new (V2) patch series with these changes reverted? Or will the maintainer automatically take care of this when merging? And, related to this, what is the "good" branch to start developing new drm patches? Is is "drm-next" or "linux-next"? Or does it change depending on how much time until the merge window closes? Thanks!
On 15.11.2018 23:16, Fernando Ramos wrote: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > --- > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- For mxsfb: Acked-by: Stefan Agner <stefan@agner.ch> -- Stefan > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- > 8 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c > index f067de4e1e82..dcb06d4e9135 100644 > --- a/drivers/gpu/drm/arc/arcpgu_drv.c > +++ b/drivers/gpu/drm/arc/arcpgu_drv.c > @@ -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; > } > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 843cac222e60..f8da51a63e2f 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -775,7 +775,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; > } > @@ -786,7 +786,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; > } > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > index 83c1f46670bf..52802e6049e0 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c > @@ -550,7 +550,7 @@ static int etnaviv_bind(struct device *dev) > out_bind: > kfree(priv); > out_unref: > - drm_dev_unref(drm); > + drm_dev_put(drm); > > return ret; > } > @@ -567,7 +567,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 = { > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c > b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > index 2393e6d16ffd..88ba003979e6 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > @@ -417,7 +417,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; > } > @@ -428,7 +428,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; > } > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > index 084f58df4a8c..c7fe2433ab9e 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > @@ -454,7 +454,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; > } > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c > b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > index 6ececad6f845..8554102a6ead 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > @@ -194,7 +194,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; > } > @@ -290,7 +290,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; > } > diff --git a/drivers/gpu/drm/tve200/tve200_drv.c > b/drivers/gpu/drm/tve200/tve200_drv.c > index 72efcecb44f7..28e2d03c0ccf 100644 > --- a/drivers/gpu/drm/tve200/tve200_drv.c > +++ b/drivers/gpu/drm/tve200/tve200_drv.c > @@ -249,7 +249,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; > } > > @@ -263,7 +263,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; > } > diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c > index 11ef17c2d1c1..5b6f1eda52e0 100644 > --- a/drivers/gpu/drm/zte/zx_drm_drv.c > +++ b/drivers/gpu/drm/zte/zx_drm_drv.c > @@ -114,7 +114,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; > } > > @@ -127,7 +127,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 = {
On Thu, Nov 15, 2018 at 11:16:23PM +0100, Fernando Ramos wrote: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> > --- > drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- > drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- > drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- > drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- We have already queued a patch [1] from Thomas Zimmermann for zx_drm_drv. Shawn [1] https://patchwork.kernel.org/patch/10615837/
On Fri, 16 Nov 2018, Fernando <greenfoo@gluegarage.com> wrote: > And, related to this, what is the "good" branch to start developing > new drm patches? Is is "drm-next" or "linux-next"? Or does it change > depending on how much time until the merge window closes? I advise most of our developers to work on drm-tip because it contains the latest stuff in drm core, i915, amd, most of the small drivers, as well as sound. It's a bit like "linux-next for graphics". And you don't really have to care about the merge cycles with that. But YMMV, it probably doesn't work for everyone. BR, Jani.
On Fri, Nov 16, 2018 at 6:04 PM Fernando <greenfoo@gluegarage.com> wrote: > I'm new on this, how should I proceed? Should I create a new (V2) patch series with > these changes reverted? Or will the maintainer automatically take care > of this when merging? I fixed it :) I think. At least I hope I didn't do something bad. Yours, Linus Walleij
On Thu, Nov 15, 2018 at 11:17 PM Fernando Ramos <greenfoo@gluegarage.com> wrote: > This patch unifies the naming of DRM functions for reference counting as > requested on Documentation/gpu/todo.rst > > Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> Patch applied after some collecting ACKs and tweaking. Yours, Linus Walleij
diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c index f067de4e1e82..dcb06d4e9135 100644 --- a/drivers/gpu/drm/arc/arcpgu_drv.c +++ b/drivers/gpu/drm/arc/arcpgu_drv.c @@ -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; } diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 843cac222e60..f8da51a63e2f 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -775,7 +775,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; } @@ -786,7 +786,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; } diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 83c1f46670bf..52802e6049e0 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -550,7 +550,7 @@ static int etnaviv_bind(struct device *dev) out_bind: kfree(priv); out_unref: - drm_dev_unref(drm); + drm_dev_put(drm); return ret; } @@ -567,7 +567,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 = { diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 2393e6d16ffd..88ba003979e6 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -417,7 +417,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; } @@ -428,7 +428,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; } diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 084f58df4a8c..c7fe2433ab9e 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -454,7 +454,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; } diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 6ececad6f845..8554102a6ead 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c @@ -194,7 +194,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; } @@ -290,7 +290,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; } diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 72efcecb44f7..28e2d03c0ccf 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -249,7 +249,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; } @@ -263,7 +263,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; } diff --git a/drivers/gpu/drm/zte/zx_drm_drv.c b/drivers/gpu/drm/zte/zx_drm_drv.c index 11ef17c2d1c1..5b6f1eda52e0 100644 --- a/drivers/gpu/drm/zte/zx_drm_drv.c +++ b/drivers/gpu/drm/zte/zx_drm_drv.c @@ -114,7 +114,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; } @@ -127,7 +127,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 = {
This patch unifies the naming of DRM functions for reference counting as requested on Documentation/gpu/todo.rst Signed-off-by: Fernando Ramos <greenfoo@gluegarage.com> --- drivers/gpu/drm/arc/arcpgu_drv.c | 4 ++-- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 ++-- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++-- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 ++-- drivers/gpu/drm/tve200/tve200_drv.c | 4 ++-- drivers/gpu/drm/zte/zx_drm_drv.c | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-)