Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Pankaj Bharadiya and committed by
Daniel Vetter
ff1f62d3 75b2ccde

-62
-2
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
··· 342 342 return ret; 343 343 } 344 344 345 - drm_fb_helper_single_add_all_connectors(&rfbdev->helper); 346 - 347 345 /* disable all the possible outputs/crtcs before entering KMS mode */ 348 346 if (!amdgpu_device_has_dc_support(adev)) 349 347 drm_helper_disable_unused_functions(adev->ddev);
-6
drivers/gpu/drm/armada/armada_fbdev.c
··· 135 135 goto err_fb_helper; 136 136 } 137 137 138 - ret = drm_fb_helper_single_add_all_connectors(fbh); 139 - if (ret) { 140 - DRM_ERROR("failed to add fb connectors\n"); 141 - goto err_fb_setup; 142 - } 143 - 144 138 ret = drm_fb_helper_initial_config(fbh, 32); 145 139 if (ret) { 146 140 DRM_ERROR("failed to set initial config\n");
-3
drivers/gpu/drm/bridge/tc358764.c
··· 375 375 drm_connector_attach_encoder(&ctx->connector, bridge->encoder); 376 376 drm_panel_attach(ctx->panel, &ctx->connector); 377 377 ctx->connector.funcs->reset(&ctx->connector); 378 - drm_fb_helper_add_one_connector(drm->fb_helper, &ctx->connector); 379 378 drm_connector_register(&ctx->connector); 380 379 381 380 return 0; ··· 383 384 static void tc358764_detach(struct drm_bridge *bridge) 384 385 { 385 386 struct tc358764 *ctx = bridge_to_tc358764(bridge); 386 - struct drm_device *drm = bridge->dev; 387 387 388 388 drm_connector_unregister(&ctx->connector); 389 - drm_fb_helper_remove_one_connector(drm->fb_helper, &ctx->connector); 390 389 drm_panel_detach(ctx->panel); 391 390 ctx->panel = NULL; 392 391 drm_connector_put(&ctx->connector);
-1
drivers/gpu/drm/exynos/exynos_drm_dsi.c
··· 1514 1514 return 0; 1515 1515 1516 1516 connector->funcs->reset(connector); 1517 - drm_fb_helper_add_one_connector(drm->fb_helper, connector); 1518 1517 drm_connector_register(connector); 1519 1518 return 0; 1520 1519 }
-8
drivers/gpu/drm/exynos/exynos_drm_fbdev.c
··· 207 207 goto err_init; 208 208 } 209 209 210 - ret = drm_fb_helper_single_add_all_connectors(helper); 211 - if (ret < 0) { 212 - DRM_DEV_ERROR(dev->dev, 213 - "failed to register drm_fb_helper_connector.\n"); 214 - goto err_setup; 215 - 216 - } 217 - 218 210 ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP); 219 211 if (ret < 0) { 220 212 DRM_DEV_ERROR(dev->dev,
-4
drivers/gpu/drm/gma500/framebuffer.c
··· 517 517 if (ret) 518 518 goto free; 519 519 520 - ret = drm_fb_helper_single_add_all_connectors(fb_helper); 521 - if (ret) 522 - goto fini; 523 - 524 520 /* disable all the possible outputs/crtcs before entering KMS mode */ 525 521 drm_helper_disable_unused_functions(dev); 526 522
-2
drivers/gpu/drm/i915/display/intel_fbdev.c
··· 462 462 dev_priv->fbdev = ifbdev; 463 463 INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker); 464 464 465 - drm_fb_helper_single_add_all_connectors(&ifbdev->helper); 466 - 467 465 return 0; 468 466 } 469 467
-4
drivers/gpu/drm/msm/msm_fbdev.c
··· 166 166 goto fail; 167 167 } 168 168 169 - ret = drm_fb_helper_single_add_all_connectors(helper); 170 - if (ret) 171 - goto fini; 172 - 173 169 /* the fw fb could be anywhere in memory */ 174 170 drm_fb_helper_remove_conflicting_framebuffers(NULL, "msm", false); 175 171
-7
drivers/gpu/drm/nouveau/dispnv50/disp.c
··· 1260 1260 nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr, 1261 1261 struct drm_connector *connector) 1262 1262 { 1263 - struct nouveau_drm *drm = nouveau_drm(connector->dev); 1264 1263 struct nv50_mstc *mstc = nv50_mstc(connector); 1265 1264 1266 1265 drm_connector_unregister(&mstc->connector); 1267 - 1268 - drm_fb_helper_remove_one_connector(&drm->fbcon->helper, &mstc->connector); 1269 1266 1270 1267 drm_connector_put(&mstc->connector); 1271 1268 } ··· 1270 1273 static void 1271 1274 nv50_mstm_register_connector(struct drm_connector *connector) 1272 1275 { 1273 - struct nouveau_drm *drm = nouveau_drm(connector->dev); 1274 - 1275 - drm_fb_helper_add_one_connector(&drm->fbcon->helper, connector); 1276 - 1277 1276 drm_connector_register(connector); 1278 1277 } 1279 1278
-4
drivers/gpu/drm/nouveau/nouveau_fbcon.c
··· 562 562 if (ret) 563 563 goto free; 564 564 565 - ret = drm_fb_helper_single_add_all_connectors(&fbcon->helper); 566 - if (ret) 567 - goto fini; 568 - 569 565 if (preferred_bpp != 8 && preferred_bpp != 16 && preferred_bpp != 32) { 570 566 if (drm->client.device.info.ram_size <= 32 * 1024 * 1024) 571 567 preferred_bpp = 8;
-4
drivers/gpu/drm/omapdrm/omap_fbdev.c
··· 246 246 if (ret) 247 247 goto fail; 248 248 249 - ret = drm_fb_helper_single_add_all_connectors(helper); 250 - if (ret) 251 - goto fini; 252 - 253 249 ret = drm_fb_helper_initial_config(helper, 32); 254 250 if (ret) 255 251 goto fini;
-4
drivers/gpu/drm/radeon/radeon_fb.c
··· 358 358 if (ret) 359 359 goto free; 360 360 361 - ret = drm_fb_helper_single_add_all_connectors(&rfbdev->helper); 362 - if (ret) 363 - goto fini; 364 - 365 361 /* disable all the possible outputs/crtcs before entering KMS mode */ 366 362 drm_helper_disable_unused_functions(rdev->ddev); 367 363
-7
drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
··· 132 132 return ret; 133 133 } 134 134 135 - ret = drm_fb_helper_single_add_all_connectors(helper); 136 - if (ret < 0) { 137 - DRM_DEV_ERROR(dev->dev, 138 - "Failed to add connectors - %d.\n", ret); 139 - goto err_drm_fb_helper_fini; 140 - } 141 - 142 135 ret = drm_fb_helper_initial_config(helper, PREFERRED_BPP); 143 136 if (ret < 0) { 144 137 DRM_DEV_ERROR(dev->dev,
-6
drivers/gpu/drm/tegra/fb.c
··· 321 321 return err; 322 322 } 323 323 324 - err = drm_fb_helper_single_add_all_connectors(&fbdev->base); 325 - if (err < 0) { 326 - dev_err(drm->dev, "failed to add connectors: %d\n", err); 327 - goto fini; 328 - } 329 - 330 324 err = drm_fb_helper_initial_config(&fbdev->base, preferred_bpp); 331 325 if (err < 0) { 332 326 dev_err(drm->dev, "failed to set initial configuration: %d\n",