[PATCH 5/9] drm: Remove drm_fb_helper add, add all and remove connector calls
Alex Deucher
alexdeucher at gmail.com
Mon Mar 2 21:42:59 UTC 2020
On Mon, Mar 2, 2020 at 8:09 AM Pankaj Bharadiya
<pankaj.laxminarayan.bharadiya at intel.com> wrote:
>
> drm_fb_helper_{add,remove}_one_connector() and
> drm_fb_helper_single_add_all_connectors() are dummy functions now
> and serve no purpose. Hence remove their calls.
>
> This is the preparatory step for removing the
> drm_fb_helper_{add,remove}_one_connector() functions from
> drm_fb_helper.h
>
> This removal is done using below sementic patch:
>
> @@
> @@
>
> - drm_fb_helper_single_add_all_connectors(...);
>
> @@
> expression e1;
> statement S;
> @@
> - e1 = drm_fb_helper_single_add_all_connectors(...);
> - S
>
> @@
> @@
>
> - drm_fb_helper_add_one_connector(...);
>
> @@
> @@
>
> - drm_fb_helper_remove_one_connector(...);
>
> Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya at intel.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 --
> drivers/gpu/drm/armada/armada_fbdev.c | 6 ------
> drivers/gpu/drm/bridge/tc358764.c | 2 --
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 -
> drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 8 --------
> drivers/gpu/drm/gma500/framebuffer.c | 4 ----
> drivers/gpu/drm/i915/display/intel_fbdev.c | 2 --
> drivers/gpu/drm/msm/msm_fbdev.c | 4 ----
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 ----
> drivers/gpu/drm/nouveau/nouveau_fbcon.c | 4 ----
> drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 ----
> drivers/gpu/drm/radeon/radeon_fb.c | 4 ----
> drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 7 -------
> drivers/gpu/drm/tegra/fb.c | 6 ------
> 14 files changed, 58 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index 579d614c7b70..9ae7b61f696a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -342,8 +342,6 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
> return ret;
> }
>
> - drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
> -
> /* disable all the possible outputs/crtcs before entering KMS mode */
> if (!amdgpu_device_has_dc_support(adev))
> drm_helper_disable_unused_functions(adev->ddev);
> diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
> index 6254353c00ae..f2dc371bd8e5 100644
> --- a/drivers/gpu/drm/armada/armada_fbdev.c
> +++ b/drivers/gpu/drm/armada/armada_fbdev.c
> @@ -135,12 +135,6 @@ int armada_fbdev_init(struct drm_device *dev)
> goto err_fb_helper;
> }
>
> - ret = drm_fb_helper_single_add_all_connectors(fbh);
> - if (ret) {
> - DRM_ERROR("failed to add fb connectors\n");
> - goto err_fb_setup;
> - }
> -
> ret = drm_fb_helper_initial_config(fbh, 32);
> if (ret) {
> DRM_ERROR("failed to set initial config\n");
> diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c
> index 283e4a8dd923..530342dd4a34 100644
> --- a/drivers/gpu/drm/bridge/tc358764.c
> +++ b/drivers/gpu/drm/bridge/tc358764.c
> @@ -375,7 +375,6 @@ static int tc358764_attach(struct drm_bridge *bridge,
> drm_connector_attach_encoder(&ctx->connector, bridge->encoder);
> drm_panel_attach(ctx->panel, &ctx->connector);
> ctx->connector.funcs->reset(&ctx->connector);
> - drm_fb_helper_add_one_connector(drm->fb_helper, &ctx->connector);
> drm_connector_register(&ctx->connector);
>
> return 0;
> @@ -387,7 +386,6 @@ static void tc358764_detach(struct drm_bridge *bridge)
> struct drm_device *drm = bridge->dev;
>
> drm_connector_unregister(&ctx->connector);
> - drm_fb_helper_remove_one_connector(drm->fb_helper, &ctx->connector);
> drm_panel_detach(ctx->panel);
> ctx->panel = NULL;
> drm_connector_put(&ctx->connector);
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index 669d3857502a..38e43d957ae0 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1514,7 +1514,6 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
> return 0;
>
> connector->funcs->reset(connector);
> - drm_fb_helper_add_one_connector(drm->fb_helper, connector);
> drm_connector_register(connector);
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> index 5afecb6a30ad..e6ceaf36fb04 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> @@ -207,14 +207,6 @@ int exynos_drm_fbdev_init(struct drm_device *dev)
> goto err_init;
> }
>
> - ret = drm_fb_helper_single_add_all_connectors(helper);
> - if (ret < 0) {
> - DRM_DEV_ERROR(dev->dev,
> - "failed to register drm_fb_helper_connector.\n");
> - goto err_setup;
> -
> - }
> -
> ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
> if (ret < 0) {
> DRM_DEV_ERROR(dev->dev,
> diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
> index fe892e1243db..1d8f67e4795a 100644
> --- a/drivers/gpu/drm/gma500/framebuffer.c
> +++ b/drivers/gpu/drm/gma500/framebuffer.c
> @@ -517,10 +517,6 @@ int psb_fbdev_init(struct drm_device *dev)
> if (ret)
> goto free;
>
> - ret = drm_fb_helper_single_add_all_connectors(fb_helper);
> - if (ret)
> - goto fini;
> -
> /* disable all the possible outputs/crtcs before entering KMS mode */
> drm_helper_disable_unused_functions(dev);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 8f65963266a3..3bc804212a99 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -461,8 +461,6 @@ int intel_fbdev_init(struct drm_device *dev)
> dev_priv->fbdev = ifbdev;
> INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);
>
> - drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
> index b4f44146d9de..47235f8c5922 100644
> --- a/drivers/gpu/drm/msm/msm_fbdev.c
> +++ b/drivers/gpu/drm/msm/msm_fbdev.c
> @@ -166,10 +166,6 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
> goto fail;
> }
>
> - ret = drm_fb_helper_single_add_all_connectors(helper);
> - if (ret)
> - goto fini;
> -
> /* the fw fb could be anywhere in memory */
> drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false);
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index a3dc2ba19fb2..97dd50e2917d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -1265,8 +1265,6 @@ nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
>
> drm_connector_unregister(&mstc->connector);
>
> - drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
> -
> drm_connector_put(&mstc->connector);
> }
>
> @@ -1275,8 +1273,6 @@ nv50_mstm_register_connector(struct drm_connector *connector)
> {
> struct nouveau_drm *drm = nouveau_drm(connector->dev);
>
> - drm_fb_helper_add_one_connector(&drm->fbcon->helper, connector);
> -
> drm_connector_register(connector);
> }
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> index 21fc7c63e2f7..24d543a01f43 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
> @@ -562,10 +562,6 @@ nouveau_fbcon_init(struct drm_device *dev)
> if (ret)
> goto free;
>
> - ret = drm_fb_helper_single_add_all_connectors(&fbcon->helper);
> - if (ret)
> - goto fini;
> -
> if (preferred_bpp != 8 && preferred_bpp != 16 && preferred_bpp != 32) {
> if (drm->client.device.info.ram_size <= 32 * 1024 * 1024)
> preferred_bpp = 8;
> diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> index eba57ac31cc6..09a84919ef73 100644
> --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
> +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> @@ -246,10 +246,6 @@ void omap_fbdev_init(struct drm_device *dev)
> if (ret)
> goto fail;
>
> - ret = drm_fb_helper_single_add_all_connectors(helper);
> - if (ret)
> - goto fini;
> -
> ret = drm_fb_helper_initial_config(helper, 32);
> if (ret)
> goto fini;
> diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
> index 1c02cd771d52..cf3156a65fc1 100644
> --- a/drivers/gpu/drm/radeon/radeon_fb.c
> +++ b/drivers/gpu/drm/radeon/radeon_fb.c
> @@ -358,10 +358,6 @@ int radeon_fbdev_init(struct radeon_device *rdev)
> if (ret)
> goto free;
>
> - ret = drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
> - if (ret)
> - goto fini;
> -
> /* disable all the possible outputs/crtcs before entering KMS mode */
> drm_helper_disable_unused_functions(rdev->ddev);
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> index 6ad4cce17089..2fdc455c4ad7 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
> @@ -132,13 +132,6 @@ int rockchip_drm_fbdev_init(struct drm_device *dev)
> return ret;
> }
>
> - ret = drm_fb_helper_single_add_all_connectors(helper);
> - if (ret < 0) {
> - DRM_DEV_ERROR(dev->dev,
> - "Failed to add connectors - %d.\n", ret);
> - goto err_drm_fb_helper_fini;
> - }
> -
> ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
> if (ret < 0) {
> DRM_DEV_ERROR(dev->dev,
> diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
> index feefe62be8dd..b8a328f53862 100644
> --- a/drivers/gpu/drm/tegra/fb.c
> +++ b/drivers/gpu/drm/tegra/fb.c
> @@ -321,12 +321,6 @@ static int tegra_fbdev_init(struct tegra_fbdev *fbdev,
> return err;
> }
>
> - err = drm_fb_helper_single_add_all_connectors(&fbdev->base);
> - if (err < 0) {
> - dev_err(drm->dev, "failed to add connectors: %d\n", err);
> - goto fini;
> - }
> -
> err = drm_fb_helper_initial_config(&fbdev->base, preferred_bpp);
> if (err < 0) {
> dev_err(drm->dev, "failed to set initial configuration: %d\n",
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list