drm: Remove drm_fb_helper add, add all and remove connector calls
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 and unused variable compilation warnings are fixed manually. @@ @@ - 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(...); Changes since v1: * Squashed warning fixes into the patch that introduced the warnings (into 5/7) (Laurent, Emil, Lyude) Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20200305120434.111091-6-pankaj.laxminarayan.bharadiya@intel.com
This commit is contained in:
parent
75b2ccde5f
commit
ff1f62d35b
@ -342,8 +342,6 @@ int amdgpu_fbdev_init(struct amdgpu_device *adev)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
|
|
||||||
|
|
||||||
/* disable all the possible outputs/crtcs before entering KMS mode */
|
/* disable all the possible outputs/crtcs before entering KMS mode */
|
||||||
if (!amdgpu_device_has_dc_support(adev))
|
if (!amdgpu_device_has_dc_support(adev))
|
||||||
drm_helper_disable_unused_functions(adev->ddev);
|
drm_helper_disable_unused_functions(adev->ddev);
|
||||||
|
@ -135,12 +135,6 @@ int armada_fbdev_init(struct drm_device *dev)
|
|||||||
goto err_fb_helper;
|
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);
|
ret = drm_fb_helper_initial_config(fbh, 32);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
DRM_ERROR("failed to set initial config\n");
|
DRM_ERROR("failed to set initial config\n");
|
||||||
|
@ -375,7 +375,6 @@ static int tc358764_attach(struct drm_bridge *bridge,
|
|||||||
drm_connector_attach_encoder(&ctx->connector, bridge->encoder);
|
drm_connector_attach_encoder(&ctx->connector, bridge->encoder);
|
||||||
drm_panel_attach(ctx->panel, &ctx->connector);
|
drm_panel_attach(ctx->panel, &ctx->connector);
|
||||||
ctx->connector.funcs->reset(&ctx->connector);
|
ctx->connector.funcs->reset(&ctx->connector);
|
||||||
drm_fb_helper_add_one_connector(drm->fb_helper, &ctx->connector);
|
|
||||||
drm_connector_register(&ctx->connector);
|
drm_connector_register(&ctx->connector);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -384,10 +383,8 @@ static int tc358764_attach(struct drm_bridge *bridge,
|
|||||||
static void tc358764_detach(struct drm_bridge *bridge)
|
static void tc358764_detach(struct drm_bridge *bridge)
|
||||||
{
|
{
|
||||||
struct tc358764 *ctx = bridge_to_tc358764(bridge);
|
struct tc358764 *ctx = bridge_to_tc358764(bridge);
|
||||||
struct drm_device *drm = bridge->dev;
|
|
||||||
|
|
||||||
drm_connector_unregister(&ctx->connector);
|
drm_connector_unregister(&ctx->connector);
|
||||||
drm_fb_helper_remove_one_connector(drm->fb_helper, &ctx->connector);
|
|
||||||
drm_panel_detach(ctx->panel);
|
drm_panel_detach(ctx->panel);
|
||||||
ctx->panel = NULL;
|
ctx->panel = NULL;
|
||||||
drm_connector_put(&ctx->connector);
|
drm_connector_put(&ctx->connector);
|
||||||
|
@ -1514,7 +1514,6 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
connector->funcs->reset(connector);
|
connector->funcs->reset(connector);
|
||||||
drm_fb_helper_add_one_connector(drm->fb_helper, connector);
|
|
||||||
drm_connector_register(connector);
|
drm_connector_register(connector);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -207,14 +207,6 @@ int exynos_drm_fbdev_init(struct drm_device *dev)
|
|||||||
goto err_init;
|
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);
|
ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
DRM_DEV_ERROR(dev->dev,
|
DRM_DEV_ERROR(dev->dev,
|
||||||
|
@ -517,10 +517,6 @@ int psb_fbdev_init(struct drm_device *dev)
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto free;
|
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 */
|
/* disable all the possible outputs/crtcs before entering KMS mode */
|
||||||
drm_helper_disable_unused_functions(dev);
|
drm_helper_disable_unused_functions(dev);
|
||||||
|
|
||||||
|
@ -462,8 +462,6 @@ int intel_fbdev_init(struct drm_device *dev)
|
|||||||
dev_priv->fbdev = ifbdev;
|
dev_priv->fbdev = ifbdev;
|
||||||
INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);
|
INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);
|
||||||
|
|
||||||
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,10 +166,6 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
|
|||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = drm_fb_helper_single_add_all_connectors(helper);
|
|
||||||
if (ret)
|
|
||||||
goto fini;
|
|
||||||
|
|
||||||
/* the fw fb could be anywhere in memory */
|
/* the fw fb could be anywhere in memory */
|
||||||
drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false);
|
drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false);
|
||||||
|
|
||||||
|
@ -1260,23 +1260,16 @@ static void
|
|||||||
nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
|
nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
|
||||||
struct drm_connector *connector)
|
struct drm_connector *connector)
|
||||||
{
|
{
|
||||||
struct nouveau_drm *drm = nouveau_drm(connector->dev);
|
|
||||||
struct nv50_mstc *mstc = nv50_mstc(connector);
|
struct nv50_mstc *mstc = nv50_mstc(connector);
|
||||||
|
|
||||||
drm_connector_unregister(&mstc->connector);
|
drm_connector_unregister(&mstc->connector);
|
||||||
|
|
||||||
drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector);
|
|
||||||
|
|
||||||
drm_connector_put(&mstc->connector);
|
drm_connector_put(&mstc->connector);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
nv50_mstm_register_connector(struct drm_connector *connector)
|
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);
|
drm_connector_register(connector);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -562,10 +562,6 @@ nouveau_fbcon_init(struct drm_device *dev)
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto free;
|
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 (preferred_bpp != 8 && preferred_bpp != 16 && preferred_bpp != 32) {
|
||||||
if (drm->client.device.info.ram_size <= 32 * 1024 * 1024)
|
if (drm->client.device.info.ram_size <= 32 * 1024 * 1024)
|
||||||
preferred_bpp = 8;
|
preferred_bpp = 8;
|
||||||
|
@ -246,10 +246,6 @@ void omap_fbdev_init(struct drm_device *dev)
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
ret = drm_fb_helper_single_add_all_connectors(helper);
|
|
||||||
if (ret)
|
|
||||||
goto fini;
|
|
||||||
|
|
||||||
ret = drm_fb_helper_initial_config(helper, 32);
|
ret = drm_fb_helper_initial_config(helper, 32);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fini;
|
goto fini;
|
||||||
|
@ -358,10 +358,6 @@ int radeon_fbdev_init(struct radeon_device *rdev)
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto free;
|
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 */
|
/* disable all the possible outputs/crtcs before entering KMS mode */
|
||||||
drm_helper_disable_unused_functions(rdev->ddev);
|
drm_helper_disable_unused_functions(rdev->ddev);
|
||||||
|
|
||||||
|
@ -132,13 +132,6 @@ int rockchip_drm_fbdev_init(struct drm_device *dev)
|
|||||||
return ret;
|
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);
|
ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
DRM_DEV_ERROR(dev->dev,
|
DRM_DEV_ERROR(dev->dev,
|
||||||
|
@ -321,12 +321,6 @@ static int tegra_fbdev_init(struct tegra_fbdev *fbdev,
|
|||||||
return err;
|
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);
|
err = drm_fb_helper_initial_config(&fbdev->base, preferred_bpp);
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
dev_err(drm->dev, "failed to set initial configuration: %d\n",
|
dev_err(drm->dev, "failed to set initial configuration: %d\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user