drm: drop _mode_ from drm_mode_connector_attach_encoder

tjh.dev / kernel

fork atom

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

kernel os linux

fork atom

drm: drop _mode_ from drm_mode_connector_attach_encoder

Again to align with the usual prefix of just drm_connector_. Again
done with sed + manual fixup for indent issues.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-7-daniel.vetter@ffwll.ch

Daniel Vetter 7 years ago cde4c44d c555f023

+94 -97

86 changed files

expand all collapse all

Documentation

gpu

drm-kms.rst

drivers

gpu

drm

amd

amdgpu

amdgpu_encoders.c

dce_virtual.c

display

amdgpu_dm

amdgpu_dm.c

arc

arcpgu_sim.c

ast

ast_mode.c

bochs

bochs_kms.c

bridge

adv7511

adv7511_drv.c

analogix

analogix_dp_core.c

analogix-anx78xx.c

dumb-vga-dac.c

megachips-stdpxxxx-ge-b850v3-fw.c

nxp-ptn3460.c

panel.c

parade-ps8622.c

sii902x.c

synopsys

dw-hdmi.c

tc358767.c

ti-tfp410.c

cirrus

cirrus_mode.c

drm_connector.c

drm_simple_kms_helper.c

drm_writeback.c

exynos

exynos_drm_dpi.c

exynos_drm_dsi.c

exynos_drm_vidi.c

exynos_hdmi.c

fsl-dcu

fsl_dcu_drm_rgb.c

gma500

gma_display.c

mdfld_dsi_dpi.c

hisilicon

hibmc

hibmc_drm_vdac.c

i2c

tda998x_drv.c

i915

intel_display.c

intel_dp_mst.c

imx

imx-ldb.c

imx-tve.c

parallel-display.c

mediatek

mtk_dsi.c

mtk_hdmi.c

meson

meson_venc_cvbs.c

mgag200

mgag200_mode.c

msm

disp

mdp4

mdp4_lvds_connector.c

dsi

dsi_manager.c

edp

edp_connector.c

hdmi

hdmi_connector.c

nouveau

dispnv04

dac.c

dfp.c

tvnv04.c

tvnv17.c

dispnv50

disp.c

omapdrm

omap_drv.c

qxl

qxl_display.c

radeon

radeon_encoders.c

rcar-du

rcar_lvds.c

rockchip

cdn-dp-core.c

dw-mipi-dsi.c

inno_hdmi.c

rockchip_lvds.c

shmobile

shmob_drm_crtc.c

sti

sti_dvo.c

sti_hda.c

sti_hdmi.c

sun4i

sun4i_hdmi_enc.c

sun4i_lvds.c

sun4i_rgb.c

sun4i_tv.c

sun6i_mipi_dsi.c

tegra

dsi.c

hdmi.c

rgb.c

sor.c

tilcdc

tilcdc_panel.c

tilcdc_tfp410.c

udl

udl_connector.c

vc4

vc4_hdmi.c

vc4_vec.c

virtio

virtgpu_display.c

vkms

vkms_output.c

vmwgfx

vmwgfx_ldu.c

vmwgfx_scrn.c

vmwgfx_stdu.c

zte

zx_hdmi.c

zx_tvenc.c

zx_vga.c

staging

vboxvideo

vbox_mode.c

include

drm

drm_connector.h

+1 -1

Documentation/gpu/drm-kms.rst

reviewed

··· 466 466 drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs, 467 467 DRM_MODE_ENCODER_DAC); 468 468 469 469 - drm_mode_connector_attach_encoder(&intel_output->base, 469 469 + drm_connector_attach_encoder(&intel_output->base, 470 470 &intel_output->enc); 471 471 472 472 /* Set up the DDC bus. */

+1 -1

drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c

reviewed

··· 46 46 list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { 47 47 amdgpu_encoder = to_amdgpu_encoder(encoder); 48 48 if (amdgpu_encoder->devices & amdgpu_connector->devices) { 49 49 - drm_mode_connector_attach_encoder(connector, encoder); 49 49 + drm_connector_attach_encoder(connector, encoder); 50 50 if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { 51 51 amdgpu_atombios_encoder_init_backlight(amdgpu_encoder, connector); 52 52 adev->mode_info.bl_encoder = amdgpu_encoder;

+1 -1

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

reviewed

··· 627 627 drm_connector_register(connector); 628 628 629 629 /* link them */ 630 630 - drm_mode_connector_attach_encoder(connector, encoder); 630 630 + drm_connector_attach_encoder(connector, encoder); 631 631 632 632 return 0; 633 633 }

+1 -1

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

reviewed

··· 3615 3615 link, 3616 3616 link_index); 3617 3617 3618 3618 - drm_mode_connector_attach_encoder( 3618 3618 + drm_connector_attach_encoder( 3619 3619 &aconnector->base, &aencoder->base); 3620 3620 3621 3621 drm_connector_register(&aconnector->base);

+1 -1

drivers/gpu/drm/arc/arcpgu_sim.c

reviewed

··· 99 99 goto error_encoder_cleanup; 100 100 } 101 101 102 102 - ret = drm_mode_connector_attach_encoder(connector, encoder); 102 102 + ret = drm_connector_attach_encoder(connector, encoder); 103 103 if (ret < 0) { 104 104 dev_err(drm->dev, "could not attach connector to encoder\n"); 105 105 drm_connector_unregister(connector);

+1 -1

drivers/gpu/drm/ast/ast_mode.c

reviewed

··· 900 900 connector->polled = DRM_CONNECTOR_POLL_CONNECT; 901 901 902 902 encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head); 903 903 - drm_mode_connector_attach_encoder(connector, encoder); 903 903 + drm_connector_attach_encoder(connector, encoder); 904 904 905 905 ast_connector->i2c = ast_i2c_create(dev); 906 906 if (!ast_connector->i2c)

+1 -1

drivers/gpu/drm/bochs/bochs_kms.c

reviewed

··· 259 259 bochs_crtc_init(bochs->dev); 260 260 bochs_encoder_init(bochs->dev); 261 261 bochs_connector_init(bochs->dev); 262 262 - drm_mode_connector_attach_encoder(&bochs->connector, 262 262 + drm_connector_attach_encoder(&bochs->connector, 263 263 &bochs->encoder); 264 264 265 265 return 0;

+1 -1

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

reviewed

··· 860 860 } 861 861 drm_connector_helper_add(&adv->connector, 862 862 &adv7511_connector_helper_funcs); 863 863 - drm_mode_connector_attach_encoder(&adv->connector, bridge->encoder); 863 863 + drm_connector_attach_encoder(&adv->connector, bridge->encoder); 864 864 865 865 if (adv->type == ADV7533) 866 866 ret = adv7533_attach_dsi(adv);

+2 -2

drivers/gpu/drm/bridge/analogix-anx78xx.c

reviewed

··· 1048 1048 1049 1049 anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD; 1050 1050 1051 1051 - err = drm_mode_connector_attach_encoder(&anx78xx->connector, 1052 1052 - bridge->encoder); 1051 1051 + err = drm_connector_attach_encoder(&anx78xx->connector, 1052 1052 + bridge->encoder); 1053 1053 if (err) { 1054 1054 DRM_ERROR("Failed to link up connector to encoder: %d\n", err); 1055 1055 return err;

+1 -1

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

reviewed

··· 1210 1210 1211 1211 drm_connector_helper_add(connector, 1212 1212 &analogix_dp_connector_helper_funcs); 1213 1213 - drm_mode_connector_attach_encoder(connector, encoder); 1213 1213 + drm_connector_attach_encoder(connector, encoder); 1214 1214 } 1215 1215 1216 1216 /*

+1 -1

drivers/gpu/drm/bridge/dumb-vga-dac.c

reviewed

··· 122 122 return ret; 123 123 } 124 124 125 125 - drm_mode_connector_attach_encoder(&vga->connector, 125 125 + drm_connector_attach_encoder(&vga->connector, 126 126 bridge->encoder); 127 127 128 128 return 0;

+1 -1

drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c

reviewed

··· 241 241 return ret; 242 242 } 243 243 244 244 - ret = drm_mode_connector_attach_encoder(connector, bridge->encoder); 244 244 + ret = drm_connector_attach_encoder(connector, bridge->encoder); 245 245 if (ret) 246 246 return ret; 247 247

+1 -1

drivers/gpu/drm/bridge/nxp-ptn3460.c

reviewed

··· 265 265 drm_connector_helper_add(&ptn_bridge->connector, 266 266 &ptn3460_connector_helper_funcs); 267 267 drm_connector_register(&ptn_bridge->connector); 268 268 - drm_mode_connector_attach_encoder(&ptn_bridge->connector, 268 268 + drm_connector_attach_encoder(&ptn_bridge->connector, 269 269 bridge->encoder); 270 270 271 271 if (ptn_bridge->panel)

+1 -1

drivers/gpu/drm/bridge/panel.c

reviewed

··· 79 79 return ret; 80 80 } 81 81 82 82 - drm_mode_connector_attach_encoder(&panel_bridge->connector, 82 82 + drm_connector_attach_encoder(&panel_bridge->connector, 83 83 bridge->encoder); 84 84 85 85 ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);

+1 -1

drivers/gpu/drm/bridge/parade-ps8622.c

reviewed

··· 503 503 drm_connector_helper_add(&ps8622->connector, 504 504 &ps8622_connector_helper_funcs); 505 505 drm_connector_register(&ps8622->connector); 506 506 - drm_mode_connector_attach_encoder(&ps8622->connector, 506 506 + drm_connector_attach_encoder(&ps8622->connector, 507 507 bridge->encoder); 508 508 509 509 if (ps8622->panel)

+1 -1

drivers/gpu/drm/bridge/sii902x.c

reviewed

··· 324 324 else 325 325 sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT; 326 326 327 327 - drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder); 327 327 + drm_connector_attach_encoder(&sii902x->connector, bridge->encoder); 328 328 329 329 return 0; 330 330 }

+1 -1

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

reviewed

··· 1974 1974 drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs, 1975 1975 DRM_MODE_CONNECTOR_HDMIA); 1976 1976 1977 1977 - drm_mode_connector_attach_encoder(connector, encoder); 1977 1977 + drm_connector_attach_encoder(connector, encoder); 1978 1978 1979 1979 return 0; 1980 1980 }

+1 -1

drivers/gpu/drm/bridge/tc358767.c

reviewed

··· 1195 1195 1196 1196 drm_display_info_set_bus_formats(&tc->connector.display_info, 1197 1197 &bus_format, 1); 1198 1198 - drm_mode_connector_attach_encoder(&tc->connector, tc->bridge.encoder); 1198 1198 + drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder); 1199 1199 1200 1200 return 0; 1201 1201 }

+1 -1

drivers/gpu/drm/bridge/ti-tfp410.c

reviewed

··· 132 132 return ret; 133 133 } 134 134 135 135 - drm_mode_connector_attach_encoder(&dvi->connector, 135 135 + drm_connector_attach_encoder(&dvi->connector, 136 136 bridge->encoder); 137 137 138 138 return 0;

+1 -1

drivers/gpu/drm/cirrus/cirrus_mode.c

reviewed

··· 530 530 return -1; 531 531 } 532 532 533 533 - drm_mode_connector_attach_encoder(connector, encoder); 533 533 + drm_connector_attach_encoder(connector, encoder); 534 534 535 535 ret = cirrus_fbdev_init(cdev); 536 536 if (ret) {

+5 -5

drivers/gpu/drm/drm_connector.c

reviewed

··· 48 48 * 49 49 * Connectors must be attached to an encoder to be used. For devices that map 50 50 * connectors to encoders 1:1, the connector should be attached at 51 51 - * initialization time with a call to drm_mode_connector_attach_encoder(). The 51 51 + * initialization time with a call to drm_connector_attach_encoder(). The 52 52 * driver must also set the &drm_connector.encoder field to point to the 53 53 * attached encoder. 54 54 * ··· 291 291 EXPORT_SYMBOL(drm_connector_init); 292 292 293 293 /** 294 294 - * drm_mode_connector_attach_encoder - attach a connector to an encoder 294 294 + * drm_connector_attach_encoder - attach a connector to an encoder 295 295 * @connector: connector to attach 296 296 * @encoder: encoder to attach @connector to 297 297 * ··· 302 302 * Returns: 303 303 * Zero on success, negative errno on failure. 304 304 */ 305 305 - int drm_mode_connector_attach_encoder(struct drm_connector *connector, 306 306 - struct drm_encoder *encoder) 305 305 + int drm_connector_attach_encoder(struct drm_connector *connector, 306 306 + struct drm_encoder *encoder) 307 307 { 308 308 int i; 309 309 ··· 329 329 } 330 330 return -ENOMEM; 331 331 } 332 332 - EXPORT_SYMBOL(drm_mode_connector_attach_encoder); 332 332 + EXPORT_SYMBOL(drm_connector_attach_encoder); 333 333 334 334 /** 335 335 * drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other

+1 -1

drivers/gpu/drm/drm_simple_kms_helper.c

reviewed

··· 287 287 if (ret || !connector) 288 288 return ret; 289 289 290 290 - return drm_mode_connector_attach_encoder(connector, encoder); 290 290 + return drm_connector_attach_encoder(connector, encoder); 291 291 } 292 292 EXPORT_SYMBOL(drm_simple_display_pipe_init); 293 293

+1 -1

drivers/gpu/drm/drm_writeback.c

reviewed

··· 202 202 if (ret) 203 203 goto connector_fail; 204 204 205 205 - ret = drm_mode_connector_attach_encoder(connector, 205 205 + ret = drm_connector_attach_encoder(connector, 206 206 &wb_connector->encoder); 207 207 if (ret) 208 208 goto attach_fail;

+1 -1

drivers/gpu/drm/exynos/exynos_drm_dpi.c

reviewed

··· 113 113 } 114 114 115 115 drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs); 116 116 - drm_mode_connector_attach_encoder(connector, encoder); 116 116 + drm_connector_attach_encoder(connector, encoder); 117 117 118 118 return 0; 119 119 }

+1 -1

drivers/gpu/drm/exynos/exynos_drm_dsi.c

reviewed

··· 1479 1479 1480 1480 connector->status = connector_status_disconnected; 1481 1481 drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs); 1482 1482 - drm_mode_connector_attach_encoder(connector, encoder); 1482 1482 + drm_connector_attach_encoder(connector, encoder); 1483 1483 1484 1484 return 0; 1485 1485 }

+1 -1

drivers/gpu/drm/exynos/exynos_drm_vidi.c

reviewed

··· 344 344 } 345 345 346 346 drm_connector_helper_add(connector, &vidi_connector_helper_funcs); 347 347 - drm_mode_connector_attach_encoder(connector, encoder); 347 347 + drm_connector_attach_encoder(connector, encoder); 348 348 349 349 return 0; 350 350 }

+1 -1

drivers/gpu/drm/exynos/exynos_hdmi.c

reviewed

··· 951 951 } 952 952 953 953 drm_connector_helper_add(connector, &hdmi_connector_helper_funcs); 954 954 - drm_mode_connector_attach_encoder(connector, encoder); 954 954 + drm_connector_attach_encoder(connector, encoder); 955 955 956 956 if (hdata->bridge) { 957 957 ret = drm_bridge_attach(encoder, hdata->bridge, NULL);

+1 -1

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c

reviewed

··· 117 117 if (ret < 0) 118 118 goto err_cleanup; 119 119 120 120 - ret = drm_mode_connector_attach_encoder(connector, encoder); 120 120 + ret = drm_connector_attach_encoder(connector, encoder); 121 121 if (ret < 0) 122 122 goto err_sysfs; 123 123

+1 -1

drivers/gpu/drm/gma500/gma_display.c

reviewed

··· 665 665 struct gma_encoder *encoder) 666 666 { 667 667 connector->encoder = encoder; 668 668 - drm_mode_connector_attach_encoder(&connector->base, 668 668 + drm_connector_attach_encoder(&connector->base, 669 669 &encoder->base); 670 670 } 671 671

+1 -1

drivers/gpu/drm/gma500/mdfld_dsi_dpi.c

reviewed

··· 999 999 p_funcs->encoder_helper_funcs); 1000 1000 1001 1001 /*attach to given connector*/ 1002 1002 - drm_mode_connector_attach_encoder(connector, encoder); 1002 1002 + drm_connector_attach_encoder(connector, encoder); 1003 1003 1004 1004 /*set possible crtcs and clones*/ 1005 1005 if (dsi_connector->pipe) {

+1 -1

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c

reviewed

··· 133 133 } 134 134 135 135 drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs); 136 136 - drm_mode_connector_attach_encoder(connector, encoder); 136 136 + drm_connector_attach_encoder(connector, encoder); 137 137 138 138 return 0; 139 139 }

+1 -1

drivers/gpu/drm/i2c/tda998x_drv.c

reviewed

··· 1301 1301 if (ret) 1302 1302 return ret; 1303 1303 1304 1304 - drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder); 1304 1304 + drm_connector_attach_encoder(&priv->connector, &priv->encoder); 1305 1305 1306 1306 return 0; 1307 1307 }

+1 -2

drivers/gpu/drm/i915/intel_display.c

reviewed

··· 15899 15899 struct intel_encoder *encoder) 15900 15900 { 15901 15901 connector->encoder = encoder; 15902 15902 - drm_mode_connector_attach_encoder(&connector->base, 15903 15903 - &encoder->base); 15902 15902 + drm_connector_attach_encoder(&connector->base, &encoder->base); 15904 15903 } 15905 15904 15906 15905 /*

+1 -2

drivers/gpu/drm/i915/intel_dp_mst.c

reviewed

··· 466 466 struct drm_encoder *enc = 467 467 &intel_dp->mst_encoders[pipe]->base.base; 468 468 469 469 - ret = drm_mode_connector_attach_encoder(&intel_connector->base, 470 470 - enc); 469 469 + ret = drm_connector_attach_encoder(&intel_connector->base, enc); 471 470 if (ret) 472 471 goto err; 473 472 }

+1 -2

drivers/gpu/drm/imx/imx-ldb.c

reviewed

··· 471 471 drm_connector_init(drm, &imx_ldb_ch->connector, 472 472 &imx_ldb_connector_funcs, 473 473 DRM_MODE_CONNECTOR_LVDS); 474 474 - drm_mode_connector_attach_encoder(&imx_ldb_ch->connector, 475 475 - encoder); 474 474 + drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder); 476 475 } 477 476 478 477 if (imx_ldb_ch->panel) {

+1 -1

drivers/gpu/drm/imx/imx-tve.c

reviewed

··· 493 493 drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs, 494 494 DRM_MODE_CONNECTOR_VGA); 495 495 496 496 - drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder); 496 496 + drm_connector_attach_encoder(&tve->connector, &tve->encoder); 497 497 498 498 return 0; 499 499 }

+1 -1

drivers/gpu/drm/imx/parallel-display.c

reviewed

··· 197 197 return ret; 198 198 } 199 199 } else { 200 200 - drm_mode_connector_attach_encoder(&imxpd->connector, encoder); 200 200 + drm_connector_attach_encoder(&imxpd->connector, encoder); 201 201 } 202 202 203 203 return 0;

+1 -1

drivers/gpu/drm/mediatek/mtk_dsi.c

reviewed

··· 782 782 drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs); 783 783 784 784 dsi->conn.dpms = DRM_MODE_DPMS_OFF; 785 785 - drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder); 785 785 + drm_connector_attach_encoder(&dsi->conn, &dsi->encoder); 786 786 787 787 if (dsi->panel) { 788 788 ret = drm_panel_attach(dsi->panel, &dsi->conn);

+1 -1

drivers/gpu/drm/mediatek/mtk_hdmi.c

reviewed

··· 1306 1306 hdmi->conn.interlace_allowed = true; 1307 1307 hdmi->conn.doublescan_allowed = false; 1308 1308 1309 1309 - ret = drm_mode_connector_attach_encoder(&hdmi->conn, 1309 1309 + ret = drm_connector_attach_encoder(&hdmi->conn, 1310 1310 bridge->encoder); 1311 1311 if (ret) { 1312 1312 dev_err(hdmi->dev,

+1 -1

drivers/gpu/drm/meson/meson_venc_cvbs.c

reviewed

··· 282 282 283 283 encoder->possible_crtcs = BIT(0); 284 284 285 285 - drm_mode_connector_attach_encoder(connector, encoder); 285 285 + drm_connector_attach_encoder(connector, encoder); 286 286 287 287 return 0; 288 288 }

+1 -1

drivers/gpu/drm/mgag200/mgag200_mode.c

reviewed

··· 1747 1747 return -1; 1748 1748 } 1749 1749 1750 1750 - drm_mode_connector_attach_encoder(connector, encoder); 1750 1750 + drm_connector_attach_encoder(connector, encoder); 1751 1751 1752 1752 ret = mgag200_fbdev_init(mdev); 1753 1753 if (ret) {

+1 -1

drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c

reviewed

··· 132 132 connector->interlace_allowed = 0; 133 133 connector->doublescan_allowed = 0; 134 134 135 135 - drm_mode_connector_attach_encoder(connector, encoder); 135 135 + drm_connector_attach_encoder(connector, encoder); 136 136 137 137 return connector; 138 138 }

+1 -1

drivers/gpu/drm/msm/dsi/dsi_manager.c

reviewed

··· 684 684 connector->interlace_allowed = 0; 685 685 connector->doublescan_allowed = 0; 686 686 687 687 - drm_mode_connector_attach_encoder(connector, msm_dsi->encoder); 687 687 + drm_connector_attach_encoder(connector, msm_dsi->encoder); 688 688 689 689 return connector; 690 690 }

+1 -1

drivers/gpu/drm/msm/edp/edp_connector.c

reviewed

··· 134 134 connector->interlace_allowed = false; 135 135 connector->doublescan_allowed = false; 136 136 137 137 - drm_mode_connector_attach_encoder(connector, edp->encoder); 137 137 + drm_connector_attach_encoder(connector, edp->encoder); 138 138 139 139 return connector; 140 140 }

+1 -1

drivers/gpu/drm/msm/hdmi/hdmi_connector.c

reviewed

··· 477 477 return ERR_PTR(ret); 478 478 } 479 479 480 480 - drm_mode_connector_attach_encoder(connector, hdmi->encoder); 480 480 + drm_connector_attach_encoder(connector, hdmi->encoder); 481 481 482 482 return connector; 483 483 }

+1 -1

drivers/gpu/drm/nouveau/dispnv04/dac.c

reviewed

··· 556 556 encoder->possible_crtcs = entry->heads; 557 557 encoder->possible_clones = 0; 558 558 559 559 - drm_mode_connector_attach_encoder(connector, encoder); 559 559 + drm_connector_attach_encoder(connector, encoder); 560 560 return 0; 561 561 }

+1 -1

drivers/gpu/drm/nouveau/dispnv04/dfp.c

reviewed

··· 716 716 entry->location != DCB_LOC_ON_CHIP) 717 717 nv04_tmds_slave_init(encoder); 718 718 719 719 - drm_mode_connector_attach_encoder(connector, encoder); 719 719 + drm_connector_attach_encoder(connector, encoder); 720 720 return 0; 721 721 }

+1 -1

drivers/gpu/drm/nouveau/dispnv04/tvnv04.c

reviewed

··· 244 244 245 245 /* Attach it to the specified connector. */ 246 246 get_slave_funcs(encoder)->create_resources(encoder, connector); 247 247 - drm_mode_connector_attach_encoder(connector, encoder); 247 247 + drm_connector_attach_encoder(connector, encoder); 248 248 249 249 return 0; 250 250

+1 -1

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

reviewed

··· 821 821 encoder->possible_clones = 0; 822 822 823 823 nv17_tv_create_resources(encoder, connector); 824 824 - drm_mode_connector_attach_encoder(connector, encoder); 824 824 + drm_connector_attach_encoder(connector, encoder); 825 825 return 0; 826 826 }

+4 -4

drivers/gpu/drm/nouveau/dispnv50/disp.c

reviewed

··· 424 424 "dac-%04x-%04x", dcbe->hasht, dcbe->hashm); 425 425 drm_encoder_helper_add(encoder, &nv50_dac_help); 426 426 427 427 - drm_mode_connector_attach_encoder(connector, encoder); 427 427 + drm_connector_attach_encoder(connector, encoder); 428 428 return 0; 429 429 } 430 430 ··· 927 927 nouveau_conn_attach_properties(&mstc->connector); 928 928 929 929 for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++) 930 930 - drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder); 930 930 + drm_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder); 931 931 932 932 drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0); 933 933 drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0); ··· 1418 1418 "sor-%04x-%04x", dcbe->hasht, dcbe->hashm); 1419 1419 drm_encoder_helper_add(encoder, &nv50_sor_help); 1420 1420 1421 1421 - drm_mode_connector_attach_encoder(connector, encoder); 1421 1421 + drm_connector_attach_encoder(connector, encoder); 1422 1422 1423 1423 if (dcbe->type == DCB_OUTPUT_DP) { 1424 1424 struct nv50_disp *disp = nv50_disp(encoder->dev); ··· 1576 1576 "pior-%04x-%04x", dcbe->hasht, dcbe->hashm); 1577 1577 drm_encoder_helper_add(encoder, &nv50_pior_help); 1578 1578 1579 1579 - drm_mode_connector_attach_encoder(connector, encoder); 1579 1579 + drm_connector_attach_encoder(connector, encoder); 1580 1580 return 0; 1581 1581 } 1582 1582

+1 -1

drivers/gpu/drm/omapdrm/omap_drv.c

reviewed

··· 274 274 if (IS_ERR(crtc)) 275 275 return PTR_ERR(crtc); 276 276 277 277 - drm_mode_connector_attach_encoder(connector, encoder); 277 277 + drm_connector_attach_encoder(connector, encoder); 278 278 encoder->possible_crtcs = (1 << crtc_idx); 279 279 280 280 priv->crtcs[priv->num_crtcs++] = crtc;

+1 -1

drivers/gpu/drm/qxl/qxl_display.c

reviewed

··· 1086 1086 /* we get HPD via client monitors config */ 1087 1087 connector->polled = DRM_CONNECTOR_POLL_HPD; 1088 1088 encoder->possible_crtcs = 1 << num_output; 1089 1089 - drm_mode_connector_attach_encoder(&qxl_output->base, 1089 1089 + drm_connector_attach_encoder(&qxl_output->base, 1090 1090 &qxl_output->enc); 1091 1091 drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs); 1092 1092 drm_connector_helper_add(connector, &qxl_connector_helper_funcs);

+1 -1

drivers/gpu/drm/radeon/radeon_encoders.c

reviewed

··· 211 211 list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { 212 212 radeon_encoder = to_radeon_encoder(encoder); 213 213 if (radeon_encoder->devices & radeon_connector->devices) { 214 214 - drm_mode_connector_attach_encoder(connector, encoder); 214 214 + drm_connector_attach_encoder(connector, encoder); 215 215 if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) 216 216 radeon_encoder_add_backlight(radeon_encoder, connector); 217 217 }

+1 -1

drivers/gpu/drm/rcar-du/rcar_lvds.c

reviewed

··· 353 353 354 354 drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs); 355 355 356 356 - ret = drm_mode_connector_attach_encoder(connector, encoder); 356 356 + ret = drm_connector_attach_encoder(connector, encoder); 357 357 if (ret < 0) 358 358 return ret; 359 359

+1 -1

drivers/gpu/drm/rockchip/cdn-dp-core.c

reviewed

··· 1062 1062 1063 1063 drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs); 1064 1064 1065 1065 - ret = drm_mode_connector_attach_encoder(connector, encoder); 1065 1065 + ret = drm_connector_attach_encoder(connector, encoder); 1066 1066 if (ret) { 1067 1067 DRM_ERROR("failed to attach connector and encoder\n"); 1068 1068 goto err_free_connector;

+1 -1

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

reviewed

··· 1129 1129 &dw_mipi_dsi_atomic_connector_funcs, 1130 1130 DRM_MODE_CONNECTOR_DSI); 1131 1131 1132 1132 - drm_mode_connector_attach_encoder(connector, encoder); 1132 1132 + drm_connector_attach_encoder(connector, encoder); 1133 1133 1134 1134 return 0; 1135 1135 }

+1 -1

drivers/gpu/drm/rockchip/inno_hdmi.c

reviewed

··· 634 634 drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs, 635 635 DRM_MODE_CONNECTOR_HDMIA); 636 636 637 637 - drm_mode_connector_attach_encoder(&hdmi->connector, encoder); 637 637 + drm_connector_attach_encoder(&hdmi->connector, encoder); 638 638 639 639 return 0; 640 640 }

+1 -1

drivers/gpu/drm/rockchip/rockchip_lvds.c

reviewed

··· 434 434 drm_connector_helper_add(connector, 435 435 &rockchip_lvds_connector_helper_funcs); 436 436 437 437 - ret = drm_mode_connector_attach_encoder(connector, encoder); 437 437 + ret = drm_connector_attach_encoder(connector, encoder); 438 438 if (ret < 0) { 439 439 DRM_DEV_ERROR(drm_dev->dev, 440 440 "failed to attach encoder: %d\n", ret);

+1 -1

drivers/gpu/drm/shmobile/shmob_drm_crtc.c

reviewed

··· 675 675 if (ret < 0) 676 676 goto err_cleanup; 677 677 678 678 - ret = drm_mode_connector_attach_encoder(connector, encoder); 678 678 + ret = drm_connector_attach_encoder(connector, encoder); 679 679 if (ret < 0) 680 680 goto err_backlight; 681 681

+1 -1

drivers/gpu/drm/sti/sti_dvo.c

reviewed

··· 486 486 drm_connector_helper_add(drm_connector, 487 487 &sti_dvo_connector_helper_funcs); 488 488 489 489 - err = drm_mode_connector_attach_encoder(drm_connector, encoder); 489 489 + err = drm_connector_attach_encoder(drm_connector, encoder); 490 490 if (err) { 491 491 DRM_ERROR("Failed to attach a connector to a encoder\n"); 492 492 goto err_sysfs;

+1 -1

drivers/gpu/drm/sti/sti_hda.c

reviewed

··· 709 709 drm_connector_helper_add(drm_connector, 710 710 &sti_hda_connector_helper_funcs); 711 711 712 712 - err = drm_mode_connector_attach_encoder(drm_connector, encoder); 712 712 + err = drm_connector_attach_encoder(drm_connector, encoder); 713 713 if (err) { 714 714 DRM_ERROR("Failed to attach a connector to a encoder\n"); 715 715 goto err_sysfs;

+1 -1

drivers/gpu/drm/sti/sti_hdmi.c

reviewed

··· 1290 1290 1291 1291 hdmi->drm_connector = drm_connector; 1292 1292 1293 1293 - err = drm_mode_connector_attach_encoder(drm_connector, encoder); 1293 1293 + err = drm_connector_attach_encoder(drm_connector, encoder); 1294 1294 if (err) { 1295 1295 DRM_ERROR("Failed to attach a connector to a encoder\n"); 1296 1296 goto err_sysfs;

+1 -1

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

reviewed

··· 623 623 ret = cec_register_adapter(hdmi->cec_adap, dev); 624 624 if (ret < 0) 625 625 goto err_cleanup_connector; 626 626 - drm_mode_connector_attach_encoder(&hdmi->connector, &hdmi->encoder); 626 626 + drm_connector_attach_encoder(&hdmi->connector, &hdmi->encoder); 627 627 628 628 return 0; 629 629

+1 -1

drivers/gpu/drm/sun4i/sun4i_lvds.c

reviewed

··· 149 149 goto err_cleanup_connector; 150 150 } 151 151 152 152 - drm_mode_connector_attach_encoder(&lvds->connector, 152 152 + drm_connector_attach_encoder(&lvds->connector, 153 153 &lvds->encoder); 154 154 155 155 ret = drm_panel_attach(tcon->panel, &lvds->connector);

+1 -1

drivers/gpu/drm/sun4i/sun4i_rgb.c

reviewed

··· 215 215 goto err_cleanup_connector; 216 216 } 217 217 218 218 - drm_mode_connector_attach_encoder(&rgb->connector, 218 218 + drm_connector_attach_encoder(&rgb->connector, 219 219 &rgb->encoder); 220 220 221 221 ret = drm_panel_attach(tcon->panel, &rgb->connector);

+1 -1

drivers/gpu/drm/sun4i/sun4i_tv.c

reviewed

··· 623 623 } 624 624 tv->connector.interlace_allowed = true; 625 625 626 626 - drm_mode_connector_attach_encoder(&tv->connector, &tv->encoder); 626 626 + drm_connector_attach_encoder(&tv->connector, &tv->encoder); 627 627 628 628 return 0; 629 629

+1 -1

drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c

reviewed

··· 941 941 goto err_cleanup_connector; 942 942 } 943 943 944 944 - drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder); 944 944 + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder); 945 945 drm_panel_attach(dsi->panel, &dsi->connector); 946 946 947 947 return 0;

+1 -1

drivers/gpu/drm/tegra/dsi.c

reviewed

··· 1052 1052 drm_encoder_helper_add(&dsi->output.encoder, 1053 1053 &tegra_dsi_encoder_helper_funcs); 1054 1054 1055 1055 - drm_mode_connector_attach_encoder(&dsi->output.connector, 1055 1055 + drm_connector_attach_encoder(&dsi->output.connector, 1056 1056 &dsi->output.encoder); 1057 1057 drm_connector_register(&dsi->output.connector); 1058 1058

+1 -1

drivers/gpu/drm/tegra/hdmi.c

reviewed

··· 1488 1488 drm_encoder_helper_add(&hdmi->output.encoder, 1489 1489 &tegra_hdmi_encoder_helper_funcs); 1490 1490 1491 1491 - drm_mode_connector_attach_encoder(&hdmi->output.connector, 1491 1491 + drm_connector_attach_encoder(&hdmi->output.connector, 1492 1492 &hdmi->output.encoder); 1493 1493 drm_connector_register(&hdmi->output.connector); 1494 1494

+1 -1

drivers/gpu/drm/tegra/rgb.c

reviewed

··· 289 289 drm_encoder_helper_add(&output->encoder, 290 290 &tegra_rgb_encoder_helper_funcs); 291 291 292 292 - drm_mode_connector_attach_encoder(&output->connector, 292 292 + drm_connector_attach_encoder(&output->connector, 293 293 &output->encoder); 294 294 drm_connector_register(&output->connector); 295 295

+1 -1

drivers/gpu/drm/tegra/sor.c

reviewed

··· 2622 2622 encoder, NULL); 2623 2623 drm_encoder_helper_add(&sor->output.encoder, helpers); 2624 2624 2625 2625 - drm_mode_connector_attach_encoder(&sor->output.connector, 2625 2625 + drm_connector_attach_encoder(&sor->output.connector, 2626 2626 &sor->output.encoder); 2627 2627 drm_connector_register(&sor->output.connector); 2628 2628

+1 -1

drivers/gpu/drm/tilcdc/tilcdc_panel.c

reviewed

··· 223 223 connector->interlace_allowed = 0; 224 224 connector->doublescan_allowed = 0; 225 225 226 226 - ret = drm_mode_connector_attach_encoder(connector, encoder); 226 226 + ret = drm_connector_attach_encoder(connector, encoder); 227 227 if (ret) 228 228 goto fail; 229 229

+1 -1

drivers/gpu/drm/tilcdc/tilcdc_tfp410.c

reviewed

··· 240 240 connector->interlace_allowed = 0; 241 241 connector->doublescan_allowed = 0; 242 242 243 243 - ret = drm_mode_connector_attach_encoder(connector, encoder); 243 243 + ret = drm_connector_attach_encoder(connector, encoder); 244 244 if (ret) 245 245 goto fail; 246 246

+1 -1

drivers/gpu/drm/udl/udl_connector.c

reviewed

··· 200 200 drm_connector_helper_add(connector, &udl_connector_helper_funcs); 201 201 202 202 drm_connector_register(connector); 203 203 - drm_mode_connector_attach_encoder(connector, encoder); 203 203 + drm_connector_attach_encoder(connector, encoder); 204 204 connector->polled = DRM_CONNECTOR_POLL_HPD | 205 205 DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; 206 206

+1 -1

drivers/gpu/drm/vc4/vc4_hdmi.c

reviewed

··· 329 329 connector->interlace_allowed = 1; 330 330 connector->doublescan_allowed = 0; 331 331 332 332 - drm_mode_connector_attach_encoder(connector, encoder); 332 332 + drm_connector_attach_encoder(connector, encoder); 333 333 334 334 return connector; 335 335 }

+1 -1

drivers/gpu/drm/vc4/vc4_vec.c

reviewed

··· 404 404 VC4_VEC_TV_MODE_NTSC); 405 405 vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC]; 406 406 407 407 - drm_mode_connector_attach_encoder(connector, vec->encoder); 407 407 + drm_connector_attach_encoder(connector, vec->encoder); 408 408 409 409 return connector; 410 410 }

+1 -1

drivers/gpu/drm/virtio/virtgpu_display.c

reviewed

··· 292 292 drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs); 293 293 encoder->possible_crtcs = 1 << index; 294 294 295 295 - drm_mode_connector_attach_encoder(connector, encoder); 295 295 + drm_connector_attach_encoder(connector, encoder); 296 296 drm_connector_register(connector); 297 297 return 0; 298 298 }

+1 -1

drivers/gpu/drm/vkms/vkms_output.c

reviewed

··· 83 83 } 84 84 encoder->possible_crtcs = 1; 85 85 86 86 - ret = drm_mode_connector_attach_encoder(connector, encoder); 86 86 + ret = drm_connector_attach_encoder(connector, encoder); 87 87 if (ret) { 88 88 DRM_ERROR("Failed to attach connector to encoder\n"); 89 89 goto err_attach;

+1 -1

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

reviewed

··· 438 438 goto err_free_connector; 439 439 } 440 440 441 441 - (void) drm_mode_connector_attach_encoder(connector, encoder); 441 441 + (void) drm_connector_attach_encoder(connector, encoder); 442 442 encoder->possible_crtcs = (1 << unit); 443 443 encoder->possible_clones = 0; 444 444

+1 -1

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

reviewed

··· 695 695 goto err_free_connector; 696 696 } 697 697 698 698 - (void) drm_mode_connector_attach_encoder(connector, encoder); 698 698 + (void) drm_connector_attach_encoder(connector, encoder); 699 699 encoder->possible_crtcs = (1 << unit); 700 700 encoder->possible_clones = 0; 701 701

+1 -1

drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c

reviewed

··· 1486 1486 goto err_free_connector; 1487 1487 } 1488 1488 1489 1489 - (void) drm_mode_connector_attach_encoder(connector, encoder); 1489 1489 + (void) drm_connector_attach_encoder(connector, encoder); 1490 1490 encoder->possible_crtcs = (1 << unit); 1491 1491 encoder->possible_clones = 0; 1492 1492

+1 -1

drivers/gpu/drm/zte/zx_hdmi.c

reviewed

··· 326 326 drm_connector_helper_add(&hdmi->connector, 327 327 &zx_hdmi_connector_helper_funcs); 328 328 329 329 - drm_mode_connector_attach_encoder(&hdmi->connector, encoder); 329 329 + drm_connector_attach_encoder(&hdmi->connector, encoder); 330 330 331 331 return 0; 332 332 }

+1 -1

drivers/gpu/drm/zte/zx_tvenc.c

reviewed

··· 297 297 DRM_MODE_CONNECTOR_Composite); 298 298 drm_connector_helper_add(connector, &zx_tvenc_connector_helper_funcs); 299 299 300 300 - drm_mode_connector_attach_encoder(connector, encoder); 300 300 + drm_connector_attach_encoder(connector, encoder); 301 301 302 302 return 0; 303 303 }

+1 -1

drivers/gpu/drm/zte/zx_vga.c

reviewed

··· 175 175 176 176 drm_connector_helper_add(connector, &zx_vga_connector_helper_funcs); 177 177 178 178 - ret = drm_mode_connector_attach_encoder(connector, encoder); 178 178 + ret = drm_connector_attach_encoder(connector, encoder); 179 179 if (ret) { 180 180 DRM_DEV_ERROR(dev, "failed to attach encoder: %d\n", ret); 181 181 goto clean_connector;

+1 -1

drivers/staging/vboxvideo/vbox_mode.c

reviewed

··· 655 655 dev->mode_config.suggested_y_property, 0); 656 656 drm_connector_register(connector); 657 657 658 658 - drm_mode_connector_attach_encoder(connector, encoder); 658 658 + drm_connector_attach_encoder(connector, encoder); 659 659 660 660 return 0; 661 661 }

+1 -1

include/drm/drm_connector.h

reviewed

··· 1085 1085 int connector_type); 1086 1086 int drm_connector_register(struct drm_connector *connector); 1087 1087 void drm_connector_unregister(struct drm_connector *connector); 1088 1088 - int drm_mode_connector_attach_encoder(struct drm_connector *connector, 1088 1088 + int drm_connector_attach_encoder(struct drm_connector *connector, 1089 1089 struct drm_encoder *encoder); 1090 1090 1091 1091 void drm_connector_cleanup(struct drm_connector *connector);