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
This commit is contained in:
Родитель
c555f02371
Коммит
cde4c44d87
|
@ -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. */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -3615,7 +3615,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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -48,7 +48,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.
|
||||
*
|
||||
|
@ -291,7 +291,7 @@ out_put:
|
|||
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
|
||||
*
|
||||
|
@ -302,8 +302,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;
|
||||
|
||||
|
@ -329,7 +329,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
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -202,7 +202,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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -15899,8 +15899,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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -132,7 +132,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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -486,7 +486,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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -83,7 +83,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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -1085,7 +1085,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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче