On Mon, Jul 09, 2018 at 10:40:07AM +0200, Daniel Vetter wrote:
> Again to align with the usual prefix of just drm_connector_. Again
> done with sed + manual fixup for indent issues.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> ---
> Documentation/gpu/drm-kms.rst | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
> drivers/gpu/drm/arc/arcpgu_sim.c | 2 +-
> drivers/gpu/drm/ast/ast_mode.c | 2 +-
> drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +-
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
> .../gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
> drivers/gpu/drm/bridge/panel.c | 2 +-
> drivers/gpu/drm/bridge/parade-ps8622.c | 2 +-
> drivers/gpu/drm/bridge/sii902x.c | 2 +-
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> drivers/gpu/drm/bridge/tc358767.c | 2 +-
> drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
> drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 10 +++++-----
> drivers/gpu/drm/drm_simple_kms_helper.c | 2 +-
> drivers/gpu/drm/drm_writeback.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
> drivers/gpu/drm/gma500/gma_display.c | 2 +-
> drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +-
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
> drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 3 +--
> drivers/gpu/drm/i915/intel_dp_mst.c | 3 +--
> drivers/gpu/drm/imx/imx-ldb.c | 3 +--
> drivers/gpu/drm/imx/imx-tve.c | 2 +-
> drivers/gpu/drm/imx/parallel-display.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
> drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
> drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
> drivers/gpu/drm/qxl/qxl_display.c | 2 +-
> drivers/gpu/drm/radeon/radeon_encoders.c | 2 +-
> drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +-
> drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
> drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
> drivers/gpu/drm/sti/sti_dvo.c | 2 +-
> drivers/gpu/drm/sti/sti_hda.c | 2 +-
> drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +-
> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +-
> drivers/gpu/drm/tegra/dsi.c | 2 +-
> drivers/gpu/drm/tegra/hdmi.c | 2 +-
> drivers/gpu/drm/tegra/rgb.c | 2 +-
> drivers/gpu/drm/tegra/sor.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
> drivers/gpu/drm/udl/udl_connector.c | 2 +-
> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
> drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
> drivers/gpu/drm/vkms/vkms_output.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
> drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
> drivers/gpu/drm/zte/zx_tvenc.c | 2 +-
> drivers/gpu/drm/zte/zx_vga.c | 2 +-
> drivers/staging/vboxvideo/vbox_mode.c | 2 +-
> include/drm/drm_connector.h | 2 +-
> 86 files changed, 94 insertions(+), 97 deletions(-)
>
> diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
> index 514939433004..58eed08fbe31 100644
> --- a/Documentation/gpu/drm-kms.rst
> +++ b/Documentation/gpu/drm-kms.rst
> @@ -466,7 +466,7 @@ Output discovery and initialization example
> drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
> DRM_MODE_ENCODER_DAC);
>
> - drm_mode_connector_attach_encoder(&intel_output->base,
> + drm_connector_attach_encoder(&intel_output->base,
> &intel_output->enc);
>
> /* Set up the DDC bus. */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> index 94138abe093b..ae8fac34f7a5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> @@ -46,7 +46,7 @@ amdgpu_link_encoder_connector(struct drm_device *dev)
> list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
> amdgpu_encoder = to_amdgpu_encoder(encoder);
> if (amdgpu_encoder->devices & amdgpu_connector->devices) {
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
> amdgpu_atombios_encoder_init_backlight(amdgpu_encoder, connector);
> adev->mode_info.bl_encoder = amdgpu_encoder;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 016f15093173..677e96a56330 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -627,7 +627,7 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
> drm_connector_register(connector);
>
> /* link them */
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index b93fa4b3841f..a1e6aac9ed11 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3660,7 +3660,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
> link,
> link_index);
>
> - drm_mode_connector_attach_encoder(
> + drm_connector_attach_encoder(
> &aconnector->base, &aencoder->base);
>
> drm_connector_register(&aconnector->base);
> diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
> index b8f6f9a5dfbe..68629e614990 100644
> --- a/drivers/gpu/drm/arc/arcpgu_sim.c
> +++ b/drivers/gpu/drm/arc/arcpgu_sim.c
> @@ -99,7 +99,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
> goto error_encoder_cleanup;
> }
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0) {
> dev_err(drm->dev, "could not attach connector to encoder\n");
> drm_connector_unregister(connector);
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 1bb8174ad155..5e77d456d9bb 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -900,7 +900,7 @@ static int ast_connector_init(struct drm_device *dev)
> connector->polled = DRM_CONNECTOR_POLL_CONNECT;
>
> encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ast_connector->i2c = ast_i2c_create(dev);
> if (!ast_connector->i2c)
> diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
> index 233980a78591..ca5a9afdd5cf 100644
> --- a/drivers/gpu/drm/bochs/bochs_kms.c
> +++ b/drivers/gpu/drm/bochs/bochs_kms.c
> @@ -259,7 +259,7 @@ int bochs_kms_init(struct bochs_device *bochs)
> bochs_crtc_init(bochs->dev);
> bochs_encoder_init(bochs->dev);
> bochs_connector_init(bochs->dev);
> - drm_mode_connector_attach_encoder(&bochs->connector,
> + drm_connector_attach_encoder(&bochs->connector,
> &bochs->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 1f4745953aca..6437b878724a 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -860,7 +860,7 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge)
> }
> drm_connector_helper_add(&adv->connector,
> &adv7511_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(&adv->connector, bridge->encoder);
> + drm_connector_attach_encoder(&adv->connector, bridge->encoder);
>
> if (adv->type == ADV7533)
> ret = adv7533_attach_dsi(adv);
> diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> index 37f947dcadec..f8433c93f463 100644
> --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> @@ -1048,8 +1048,8 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
>
> anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD;
>
> - err = drm_mode_connector_attach_encoder(&anx78xx->connector,
> - bridge->encoder);
> + err = drm_connector_attach_encoder(&anx78xx->connector,
> + bridge->encoder);
> if (err) {
> DRM_ERROR("Failed to link up connector to encoder: %d\n", err);
> return err;
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 288c015f7460..d68986cea132 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1210,7 +1210,7 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge)
>
> drm_connector_helper_add(connector,
> &analogix_dp_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> }
>
> /*
> diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> index da99b8ba4ee1..9b706789a341 100644
> --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> @@ -122,7 +122,7 @@ static int dumb_vga_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&vga->connector,
> + drm_connector_attach_encoder(&vga->connector,
> bridge->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index b49b543bd1f6..2136c97aeb8e 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -241,7 +241,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - ret = drm_mode_connector_attach_encoder(connector, bridge->encoder);
> + ret = drm_connector_attach_encoder(connector, bridge->encoder);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index bd5c191858cb..a3e817abace1 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -265,7 +265,7 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge)
> drm_connector_helper_add(&ptn_bridge->connector,
> &ptn3460_connector_helper_funcs);
> drm_connector_register(&ptn_bridge->connector);
> - drm_mode_connector_attach_encoder(&ptn_bridge->connector,
> + drm_connector_attach_encoder(&ptn_bridge->connector,
> bridge->encoder);
>
> if (ptn_bridge->panel)
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 6d99d4a3beb3..7cbaba213ef6 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -79,7 +79,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&panel_bridge->connector,
> + drm_connector_attach_encoder(&panel_bridge->connector,
> bridge->encoder);
>
> ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index 81198f5e9afa..7334d1b62b71 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -503,7 +503,7 @@ static int ps8622_attach(struct drm_bridge *bridge)
> drm_connector_helper_add(&ps8622->connector,
> &ps8622_connector_helper_funcs);
> drm_connector_register(&ps8622->connector);
> - drm_mode_connector_attach_encoder(&ps8622->connector,
> + drm_connector_attach_encoder(&ps8622->connector,
> bridge->encoder);
>
> if (ps8622->panel)
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index cd331933c230..e59a13542333 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -324,7 +324,7 @@ static int sii902x_bridge_attach(struct drm_bridge *bridge)
> else
> sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
>
> - drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder);
> + drm_connector_attach_encoder(&sii902x->connector, bridge->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index ab32aceb6f24..5971976284bf 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1974,7 +1974,7 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
> drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs,
> DRM_MODE_CONNECTOR_HDMIA);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index ee2fd0a349b3..8e28e738cb52 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -1195,7 +1195,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
>
> drm_display_info_set_bus_formats(&tc->connector.display_info,
> &bus_format, 1);
> - drm_mode_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
> + drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index c81bf7910bbe..c3e32138c6bb 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -132,7 +132,7 @@ static int tfp410_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&dvi->connector,
> + drm_connector_attach_encoder(&dvi->connector,
> bridge->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
> index b529f8c8e2a6..336bfda40125 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_mode.c
> +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
> @@ -530,7 +530,7 @@ int cirrus_modeset_init(struct cirrus_device *cdev)
> return -1;
> }
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ret = cirrus_fbdev_init(cdev);
> if (ret) {
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index ccb70a4490d3..43cd636d83b5 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -52,7 +52,7 @@
> *
> * Connectors must be attached to an encoder to be used. For devices that map
> * connectors to encoders 1:1, the connector should be attached at
> - * initialization time with a call to drm_mode_connector_attach_encoder(). The
> + * initialization time with a call to drm_connector_attach_encoder(). The
> * driver must also set the &drm_connector.encoder field to point to the
> * attached encoder.
> *
> @@ -295,7 +295,7 @@ int drm_connector_init(struct drm_device *dev,
> EXPORT_SYMBOL(drm_connector_init);
>
> /**
> - * drm_mode_connector_attach_encoder - attach a connector to an encoder
> + * drm_connector_attach_encoder - attach a connector to an encoder
> * @connector: connector to attach
> * @encoder: encoder to attach @connector to
> *
> @@ -306,8 +306,8 @@ EXPORT_SYMBOL(drm_connector_init);
> * Returns:
> * Zero on success, negative errno on failure.
> */
> -int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> - struct drm_encoder *encoder)
> +int drm_connector_attach_encoder(struct drm_connector *connector,
> + struct drm_encoder *encoder)
> {
> int i;
>
> @@ -333,7 +333,7 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> }
> return -ENOMEM;
> }
> -EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
> +EXPORT_SYMBOL(drm_connector_attach_encoder);
>
> /**
> * drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other
> diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
> index b72fcf1e9605..51fa978f0d23 100644
> --- a/drivers/gpu/drm/drm_simple_kms_helper.c
> +++ b/drivers/gpu/drm/drm_simple_kms_helper.c
> @@ -287,7 +287,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,
> if (ret || !connector)
> return ret;
>
> - return drm_mode_connector_attach_encoder(connector, encoder);
> + return drm_connector_attach_encoder(connector, encoder);
> }
> EXPORT_SYMBOL(drm_simple_display_pipe_init);
>
> diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
> index 827395071f0b..e655bcc6c75c 100644
> --- a/drivers/gpu/drm/drm_writeback.c
> +++ b/drivers/gpu/drm/drm_writeback.c
> @@ -199,7 +199,7 @@ int drm_writeback_connector_init(struct drm_device *dev,
> if (ret)
> goto connector_fail;
>
> - ret = drm_mode_connector_attach_encoder(connector,
> + ret = drm_connector_attach_encoder(connector,
> &wb_connector->encoder);
> if (ret)
> goto attach_fail;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> index 66945e0dc57f..e3a343bb14b7 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> @@ -113,7 +113,7 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index 6d29777884f9..bee6d4a4078d 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1479,7 +1479,7 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
>
> connector->status = connector_status_disconnected;
> drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> index dfea61edba4a..19697c1362d8 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> @@ -344,7 +344,7 @@ static int vidi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &vidi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 6672d0ff0423..3a11c719a580 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -951,7 +951,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> if (hdata->bridge) {
> ret = drm_bridge_attach(encoder, hdata->bridge, NULL);
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> index c54806d08dd7..a37c06996ffe 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> @@ -117,7 +117,7 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
> if (ret < 0)
> goto err_cleanup;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> goto err_sysfs;
>
> diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
> index 08f17f85b801..09c1161a7ac6 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -665,7 +665,7 @@ void gma_connector_attach_encoder(struct gma_connector *connector,
> struct gma_encoder *encoder)
> {
> connector->encoder = encoder;
> - drm_mode_connector_attach_encoder(&connector->base,
> + drm_connector_attach_encoder(&connector->base,
> &encoder->base);
> }
>
> diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> index a05c020602bd..d0bf5a1e94e8 100644
> --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> +++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> @@ -999,7 +999,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
> p_funcs->encoder_helper_funcs);
>
> /*attach to given connector*/
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> /*set possible crtcs and clones*/
> if (dsi_connector->pipe) {
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> index d2f4749ebf8d..744956cea749 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> @@ -133,7 +133,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
> }
>
> drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index d434f576e6b2..eecdc327b9f8 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -1301,7 +1301,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
> if (ret)
> return ret;
>
> - drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
> + drm_connector_attach_encoder(&priv->connector, &priv->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index bb930755544d..be5d5dd75c3b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15934,8 +15934,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
> struct intel_encoder *encoder)
> {
> connector->encoder = encoder;
> - drm_mode_connector_attach_encoder(&connector->base,
> - &encoder->base);
> + drm_connector_attach_encoder(&connector->base, &encoder->base);
> }
>
> /*
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 85ecf41eeabb..494e5c40a464 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -466,8 +466,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> struct drm_encoder *enc =
> &intel_dp->mst_encoders[pipe]->base.base;
>
> - ret = drm_mode_connector_attach_encoder(&intel_connector->base,
> - enc);
> + ret = drm_connector_attach_encoder(&intel_connector->base, enc);
> if (ret)
> goto err;
> }
> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> index ae81cbb75f51..7312beb6f1fc 100644
> --- a/drivers/gpu/drm/imx/imx-ldb.c
> +++ b/drivers/gpu/drm/imx/imx-ldb.c
> @@ -471,8 +471,7 @@ static int imx_ldb_register(struct drm_device *drm,
> drm_connector_init(drm, &imx_ldb_ch->connector,
> &imx_ldb_connector_funcs,
> DRM_MODE_CONNECTOR_LVDS);
> - drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
> - encoder);
> + drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
> }
>
> if (imx_ldb_ch->panel) {
> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> index 1a4ced5c09b5..cffd3310240e 100644
> --- a/drivers/gpu/drm/imx/imx-tve.c
> +++ b/drivers/gpu/drm/imx/imx-tve.c
> @@ -493,7 +493,7 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
> drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs,
> DRM_MODE_CONNECTOR_VGA);
>
> - drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder);
> + drm_connector_attach_encoder(&tve->connector, &tve->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> index 4fc1cf583435..aefd04e18f93 100644
> --- a/drivers/gpu/drm/imx/parallel-display.c
> +++ b/drivers/gpu/drm/imx/parallel-display.c
> @@ -197,7 +197,7 @@ static int imx_pd_register(struct drm_device *drm,
> return ret;
> }
> } else {
> - drm_mode_connector_attach_encoder(&imxpd->connector, encoder);
> + drm_connector_attach_encoder(&imxpd->connector, encoder);
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index aa0943ec32b0..66df1b177959 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -782,7 +782,7 @@ static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi)
> drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs);
>
> dsi->conn.dpms = DRM_MODE_DPMS_OFF;
> - drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder);
> + drm_connector_attach_encoder(&dsi->conn, &dsi->encoder);
>
> if (dsi->panel) {
> ret = drm_panel_attach(dsi->panel, &dsi->conn);
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 835313940395..2d45d1dd9554 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1306,7 +1306,7 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
> hdmi->conn.interlace_allowed = true;
> hdmi->conn.doublescan_allowed = false;
>
> - ret = drm_mode_connector_attach_encoder(&hdmi->conn,
> + ret = drm_connector_attach_encoder(&hdmi->conn,
> bridge->encoder);
> if (ret) {
> dev_err(hdmi->dev,
> diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> index 79d95ca8a0c0..f7945bae3b4a 100644
> --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
> +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> @@ -282,7 +282,7 @@ int meson_venc_cvbs_create(struct meson_drm *priv)
>
> encoder->possible_crtcs = BIT(0);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index 5f104f139197..acf7bfe68454 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -1747,7 +1747,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
> return -1;
> }
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ret = mgag200_fbdev_init(mdev);
> if (ret) {
> diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> index e3b1c86b7aae..df642e06ed0d 100644
> --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> @@ -129,7 +129,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index 4beba3f7d067..21e0dc51531d 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -684,7 +684,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, msm_dsi->encoder);
> + drm_connector_attach_encoder(connector, msm_dsi->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> index 0b5eac054195..058ff92a0207 100644
> --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> @@ -134,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)
> connector->interlace_allowed = false;
> connector->doublescan_allowed = false;
>
> - drm_mode_connector_attach_encoder(connector, edp->encoder);
> + drm_connector_attach_encoder(connector, edp->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> index 07feacc5a441..e9c9a0af508e 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> @@ -477,7 +477,7 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
> return ERR_PTR(ret);
> }
>
> - drm_mode_connector_attach_encoder(connector, hdmi->encoder);
> + drm_connector_attach_encoder(connector, hdmi->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> index 4feab0a5419d..e7af95d37ddb 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> @@ -556,6 +556,6 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)
> encoder->possible_crtcs = entry->heads;
> encoder->possible_clones = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> index 9805d2cdc1a1..73d41abbb510 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> @@ -716,6 +716,6 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
> entry->location != DCB_LOC_ON_CHIP)
> nv04_tmds_slave_init(encoder);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> index 01664357d3e1..de4490b4ed30 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> @@ -244,7 +244,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
>
> /* Attach it to the specified connector. */
> get_slave_funcs(encoder)->create_resources(encoder, connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> index 6d99f11fee4e..6a4ca139cf5d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> @@ -821,6 +821,6 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry)
> encoder->possible_clones = 0;
>
> nv17_tv_create_resources(encoder, connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 2fabb69e452b..475456c19b76 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -424,7 +424,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "dac-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_dac_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
>
> @@ -927,7 +927,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
> nouveau_conn_attach_properties(&mstc->connector);
>
> for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++)
> - drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
> + drm_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
>
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
> @@ -1418,7 +1418,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "sor-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_sor_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> if (dcbe->type == DCB_OUTPUT_DP) {
> struct nv50_disp *disp = nv50_disp(encoder->dev);
> @@ -1576,7 +1576,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "pior-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_pior_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index 5005ecc284d2..1b6601e9b107 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -274,7 +274,7 @@ static int omap_modeset_init(struct drm_device *dev)
> if (IS_ERR(crtc))
> return PTR_ERR(crtc);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << crtc_idx);
>
> priv->crtcs[priv->num_crtcs++] = crtc;
> diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
> index 768207fbbae3..0570c6826bff 100644
> --- a/drivers/gpu/drm/qxl/qxl_display.c
> +++ b/drivers/gpu/drm/qxl/qxl_display.c
> @@ -1086,7 +1086,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
> /* we get HPD via client monitors config */
> connector->polled = DRM_CONNECTOR_POLL_HPD;
> encoder->possible_crtcs = 1 << num_output;
> - drm_mode_connector_attach_encoder(&qxl_output->base,
> + drm_connector_attach_encoder(&qxl_output->base,
> &qxl_output->enc);
> drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs);
> drm_connector_helper_add(connector, &qxl_connector_helper_funcs);
> diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
> index c6ee80216cf4..c341fb2a5b56 100644
> --- a/drivers/gpu/drm/radeon/radeon_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
> @@ -211,7 +211,7 @@ radeon_link_encoder_connector(struct drm_device *dev)
> list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
> radeon_encoder = to_radeon_encoder(encoder);
> if (radeon_encoder->devices & radeon_connector->devices) {
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
> radeon_encoder_add_backlight(radeon_encoder, connector);
> }
> diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> index 155ad840f3c5..4feea76a3967 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> @@ -353,7 +353,7 @@ static int rcar_lvds_attach(struct drm_bridge *bridge)
>
> drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> return ret;
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index a40cb2be50e1..8ad0d773dc33 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
>
> drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_ERROR("failed to attach connector and encoder\n");
> goto err_free_connector;
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> index d53d5a09547f..7bbbf52758b5 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> @@ -1129,7 +1129,7 @@ static int dw_mipi_dsi_register(struct drm_device *drm,
> &dw_mipi_dsi_atomic_connector_funcs,
> DRM_MODE_CONNECTOR_DSI);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index 510fcb33e31d..1c02b3e61299 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -634,7 +634,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
> drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
> DRM_MODE_CONNECTOR_HDMIA);
>
> - drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
> + drm_connector_attach_encoder(&hdmi->connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> index b3f6f524b402..456bd9f13bae 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> @@ -434,7 +434,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
> drm_connector_helper_add(connector,
> &rockchip_lvds_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0) {
> DRM_DEV_ERROR(drm_dev->dev,
> "failed to attach encoder: %d\n", ret);
> diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> index 40df8887fc17..fc66167b0641 100644
> --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> @@ -675,7 +675,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
> if (ret < 0)
> goto err_cleanup;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> goto err_backlight;
>
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index a5979cd25cc7..21929dc616a3 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -484,7 +484,7 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
> drm_connector_helper_add(drm_connector,
> &sti_dvo_connector_helper_funcs);
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
> index 67bbdb49fffc..49438337f70d 100644
> --- a/drivers/gpu/drm/sti/sti_hda.c
> +++ b/drivers/gpu/drm/sti/sti_hda.c
> @@ -709,7 +709,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
> drm_connector_helper_add(drm_connector,
> &sti_hda_connector_helper_funcs);
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index 0c3008356ab8..34cdc4644435 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -1290,7 +1290,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
>
> hdmi->drm_connector = drm_connector;
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> index 9b4b1d015423..061d2e0d9011 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> @@ -623,7 +623,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
> ret = cec_register_adapter(hdmi->cec_adap, dev);
> if (ret < 0)
> goto err_cleanup_connector;
> - drm_mode_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
> + drm_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
> index a69fe2e1f9d1..af7dcb6da351 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
> @@ -149,7 +149,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&lvds->connector,
> + drm_connector_attach_encoder(&lvds->connector,
> &lvds->encoder);
>
> ret = drm_panel_attach(tcon->panel, &lvds->connector);
> diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> index 96d21b07f8fc..bf068da6b12e 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> @@ -215,7 +215,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&rgb->connector,
> + drm_connector_attach_encoder(&rgb->connector,
> &rgb->encoder);
>
> ret = drm_panel_attach(tcon->panel, &rgb->connector);
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
> index b070d522ed8d..1a838d208211 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_tv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
> @@ -623,7 +623,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
> }
> tv->connector.interlace_allowed = true;
>
> - drm_mode_connector_attach_encoder(&tv->connector, &tv->encoder);
> + drm_connector_attach_encoder(&tv->connector, &tv->encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> index da9814f94d00..ce5dca755f7f 100644
> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> @@ -941,7 +941,7 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> drm_panel_attach(dsi->panel, &dsi->connector);
>
> return 0;
> diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
> index 87c5d89bc9ba..c1c3f18a8990 100644
> --- a/drivers/gpu/drm/tegra/dsi.c
> +++ b/drivers/gpu/drm/tegra/dsi.c
> @@ -1052,7 +1052,7 @@ static int tegra_dsi_init(struct host1x_client *client)
> drm_encoder_helper_add(&dsi->output.encoder,
> &tegra_dsi_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&dsi->output.connector,
> + drm_connector_attach_encoder(&dsi->output.connector,
> &dsi->output.encoder);
> drm_connector_register(&dsi->output.connector);
>
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index 784739a9f497..0082468f703c 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -1488,7 +1488,7 @@ static int tegra_hdmi_init(struct host1x_client *client)
> drm_encoder_helper_add(&hdmi->output.encoder,
> &tegra_hdmi_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&hdmi->output.connector,
> + drm_connector_attach_encoder(&hdmi->output.connector,
> &hdmi->output.encoder);
> drm_connector_register(&hdmi->output.connector);
>
> diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
> index 78ec5193741d..28a78d3120bc 100644
> --- a/drivers/gpu/drm/tegra/rgb.c
> +++ b/drivers/gpu/drm/tegra/rgb.c
> @@ -289,7 +289,7 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc)
> drm_encoder_helper_add(&output->encoder,
> &tegra_rgb_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&output->connector,
> + drm_connector_attach_encoder(&output->connector,
> &output->encoder);
> drm_connector_register(&output->connector);
>
> diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
> index 7d2a955fc515..d7fe9f15def1 100644
> --- a/drivers/gpu/drm/tegra/sor.c
> +++ b/drivers/gpu/drm/tegra/sor.c
> @@ -2622,7 +2622,7 @@ static int tegra_sor_init(struct host1x_client *client)
> encoder, NULL);
> drm_encoder_helper_add(&sor->output.encoder, helpers);
>
> - drm_mode_connector_attach_encoder(&sor->output.connector,
> + drm_connector_attach_encoder(&sor->output.connector,
> &sor->output.encoder);
> drm_connector_register(&sor->output.connector);
>
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> index d616d64a6725..a1acab39d87f 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> @@ -223,7 +223,7 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret)
> goto fail;
>
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> index 46dacca3cce8..daebf1aa6b0a 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> @@ -240,7 +240,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret)
> goto fail;
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index 8fac12e1a1a4..68e88bed77ca 100644
> --- a/drivers/gpu/drm/udl/udl_connector.c
> +++ b/drivers/gpu/drm/udl/udl_connector.c
> @@ -200,7 +200,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
> drm_connector_helper_add(connector, &udl_connector_helper_funcs);
>
> drm_connector_register(connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> connector->polled = DRM_CONNECTOR_POLL_HPD |
> DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
>
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 91f284e1b908..fd5522fd179e 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -329,7 +329,7 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
> connector->interlace_allowed = 1;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
> index 3a9a302247a2..8e7facb6514e 100644
> --- a/drivers/gpu/drm/vc4/vc4_vec.c
> +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> @@ -404,7 +404,7 @@ static struct drm_connector *vc4_vec_connector_init(struct drm_device *dev,
> VC4_VEC_TV_MODE_NTSC);
> vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
>
> - drm_mode_connector_attach_encoder(connector, vec->encoder);
> + drm_connector_attach_encoder(connector, vec->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
> index ff9933e79416..25503b933599 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_display.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_display.c
> @@ -292,7 +292,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
> drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
> encoder->possible_crtcs = 1 << index;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> drm_connector_register(connector);
> return 0;
> }
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 48143eac3c12..e8e0e6615ff9 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -63,7 +63,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)
> }
> encoder->possible_crtcs = 1;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_ERROR("Failed to attach connector to encoder\n");
> goto err_attach;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index dc0cfda26b1b..a234fe0e1061 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -438,7 +438,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index 73cf3c6e1591..dd417eb74524 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -695,7 +695,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> index a474d87b1af3..4cca78cab03f 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> @@ -1486,7 +1486,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> index d073c6737500..78655269d843 100644
> --- a/drivers/gpu/drm/zte/zx_hdmi.c
> +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> @@ -326,7 +326,7 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi)
> drm_connector_helper_add(&hdmi->connector,
> &zx_hdmi_connector_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
> + drm_connector_attach_encoder(&hdmi->connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
> index 0de1a71ca4e0..b73afb212fb2 100644
> --- a/drivers/gpu/drm/zte/zx_tvenc.c
> +++ b/drivers/gpu/drm/zte/zx_tvenc.c
> @@ -297,7 +297,7 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc)
> DRM_MODE_CONNECTOR_Composite);
> drm_connector_helper_add(connector, &zx_tvenc_connector_helper_funcs);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> index 3e78ee21b8d0..23d1ff4355a0 100644
> --- a/drivers/gpu/drm/zte/zx_vga.c
> +++ b/drivers/gpu/drm/zte/zx_vga.c
> @@ -175,7 +175,7 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga)
>
> drm_connector_helper_add(connector, &zx_vga_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_DEV_ERROR(dev, "failed to attach encoder: %d\n", ret);
> goto clean_connector;
> diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
> index a943d2f683ed..da4a93df8d75 100644
> --- a/drivers/staging/vboxvideo/vbox_mode.c
> +++ b/drivers/staging/vboxvideo/vbox_mode.c
> @@ -655,7 +655,7 @@ static int vbox_connector_init(struct drm_device *dev,
> dev->mode_config.suggested_y_property, 0);
> drm_connector_register(connector);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index 9841d2b6d3eb..dfd7a3595a6c 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -1081,7 +1081,7 @@ int drm_connector_init(struct drm_device *dev,
> int connector_type);
> int drm_connector_register(struct drm_connector *connector);
> void drm_connector_unregister(struct drm_connector *connector);
> -int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> +int drm_connector_attach_encoder(struct drm_connector *connector,
> struct drm_encoder *encoder);
>
> void drm_connector_cleanup(struct drm_connector *connector);
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
