On Fri, Jul 13, 2018 at 10:59:06AM -0400, Sean Paul wrote:
> On Mon, Jul 09, 2018 at 10:40:06AM +0200, Daniel Vetter wrote:
> > Just makes it longer, and for most things in drm_connector.[hc] we
> > just use the drm_connector_ prefix. Done with sed + a bit of manual
> > fixup for the indenting.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 ++--
> > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
> > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
> > drivers/gpu/drm/ast/ast_mode.c | 4 ++--
> > 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 | 4 ++--
> > drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
> > drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
> > drivers/gpu/drm/bridge/nxp-ptn3460.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/drm_connector.c | 8 ++++----
> > drivers/gpu/drm/drm_debugfs.c | 4 ++--
> > drivers/gpu/drm/drm_probe_helper.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
> > drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
> > drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
> > drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
> > drivers/gpu/drm/i915/intel_dp.c | 2 +-
> > drivers/gpu/drm/i915/intel_lvds.c | 2 +-
> > drivers/gpu/drm/i915/intel_modes.c | 2 +-
> > drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
> > drivers/gpu/drm/imx/imx-ldb.c | 2 +-
> > drivers/gpu/drm/imx/imx-tve.c | 2 +-
> > drivers/gpu/drm/imx/parallel-display.c | 2 +-
> > drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
> > drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
> > drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
> > drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
> > drivers/gpu/drm/omapdrm/omap_connector.c | 4 ++--
> > drivers/gpu/drm/panel/panel-simple.c | 2 +-
> > drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++--
> > drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 ++--
> > drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
> > drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
> > drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
> > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> > drivers/gpu/drm/tegra/output.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/zte/zx_hdmi.c | 2 +-
> > drivers/gpu/drm/zte/zx_vga.c | 2 +-
> > drivers/staging/vboxvideo/vbox_mode.c | 2 +-
>
> Is this any closer to graduating from staging? From a glance at the history, it
> doesn't seem like it's moved closer in a very long time.
I fear -staging's idea of "long time" and our idea of "long time" do not
match :-)
But yeah I'm also not seeing how putting a drm driver into staging is
helping it getting merged properly. The drivers floating on dri-devel imo
get a lot more attention than anything stuck in staging ghetto.
-Daniel
>
> Anyways,
>
> Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
>
>
> > include/drm/drm_connector.h | 6 +++---
> > include/drm/drm_modeset_helper_vtables.h | 2 +-
> > 56 files changed, 74 insertions(+), 74 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > index 881f7cb7ae6e..c770d73352a7 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > @@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)
> > int ret;
> >
> > if (amdgpu_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);
> > + drm_connector_update_edid_property(connector, amdgpu_connector->edid);
> > ret = drm_add_edid_modes(connector, amdgpu_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > 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 f0fc3067ab5d..b93fa4b3841f 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > @@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
> > (struct edid *) sink->dc_edid.raw_edid;
> >
> >
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > aconnector->edid);
> > }
> > amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
> >
> > } else {
> > amdgpu_dm_remove_sink_from_freesync_module(connector);
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > aconnector->num_modes = 0;
> > aconnector->dc_sink = NULL;
> > aconnector->edid = NULL;
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > index 4304d9e408b8..581bb75d08eb 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > @@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> > edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
> >
> > if (!edid) {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > &aconnector->base,
> > NULL);
> > return ret;
> > @@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> > connector, aconnector->edid);
> > }
> >
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > &aconnector->base, aconnector->edid);
> >
> > ret = drm_add_edid_modes(connector, aconnector->edid);
> > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> > index 036dff8a1f33..1bb8174ad155 100644
> > --- a/drivers/gpu/drm/ast/ast_mode.c
> > +++ b/drivers/gpu/drm/ast/ast_mode.c
> > @@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector)
> > if (!flags)
> > edid = drm_get_edid(connector, &ast_connector->i2c->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(&ast_connector->base, edid);
> > + drm_connector_update_edid_property(&ast_connector->base, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > return ret;
> > } else
> > - drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
> > + drm_connector_update_edid_property(&ast_connector->base, NULL);
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > index 73021b388e12..1f4745953aca 100644
> > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > @@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
> > __adv7511_power_off(adv7511);
> >
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > count = drm_add_edid_modes(connector, edid);
> >
> > adv7511_set_config_csc(adv7511, connector, adv7511->rgb,
> > diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > index b49043866be6..37f947dcadec 100644
> > --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > @@ -969,8 +969,8 @@ static int anx78xx_get_modes(struct drm_connector *connector)
> > goto unlock;
> > }
> >
> > - err = drm_mode_connector_update_edid_property(connector,
> > - anx78xx->edid);
> > + err = drm_connector_update_edid_property(connector,
> > + anx78xx->edid);
> > if (err) {
> > DRM_ERROR("Failed to update EDID property: %d\n", err);
> > goto unlock;
> > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > index 2bcbfadb6ac5..288c015f7460 100644
> > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > @@ -1119,8 +1119,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
> > edid = drm_get_edid(connector, &dp->aux.ddc);
> > pm_runtime_put(dp->dev);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(&dp->connector,
> > - edid);
> > + drm_connector_update_edid_property(&dp->connector,
> > + edid);
> > num_modes += drm_add_edid_modes(&dp->connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > index 9837c8d69e69..da99b8ba4ee1 100644
> > --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > @@ -55,7 +55,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)
> > goto fallback;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > return ret;
> > 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 7ccadba7c98c..b49b543bd1f6 100644
> > --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> > +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> > @@ -152,7 +152,7 @@ static int ge_b850v3_lvds_get_modes(struct drm_connector *connector)
> > ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client);
> >
> > if (ge_b850v3_lvds_ptr->edid) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > ge_b850v3_lvds_ptr->edid);
> > num_modes = drm_add_edid_modes(connector,
> > ge_b850v3_lvds_ptr->edid);
> > diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > index d64a3283822a..bd5c191858cb 100644
> > --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > @@ -222,7 +222,7 @@ static int ptn3460_get_modes(struct drm_connector *connector)
> > }
> >
> > ptn_bridge->edid = (struct edid *)edid;
> > - drm_mode_connector_update_edid_property(connector, ptn_bridge->edid);
> > + drm_connector_update_edid_property(connector, ptn_bridge->edid);
> >
> > num_modes = drm_add_edid_modes(connector, ptn_bridge->edid);
> >
> > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> > index 60373d7eb220..cd331933c230 100644
> > --- a/drivers/gpu/drm/bridge/sii902x.c
> > +++ b/drivers/gpu/drm/bridge/sii902x.c
> > @@ -170,7 +170,7 @@ static int sii902x_get_modes(struct drm_connector *connector)
> > return ret;
> >
> > edid = drm_get_edid(connector, sii902x->i2c->adapter);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > if (edid) {
> > num = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > index 3c136f2b954f..ab32aceb6f24 100644
> > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > @@ -1922,7 +1922,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
> >
> > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> > index 0fd9cf27542c..ee2fd0a349b3 100644
> > --- a/drivers/gpu/drm/bridge/tc358767.c
> > +++ b/drivers/gpu/drm/bridge/tc358767.c
> > @@ -1140,7 +1140,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)
> > if (!edid)
> > return 0;
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > count = drm_add_edid_modes(connector, edid);
> >
> > return count;
> > diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> > index acb857030951..c81bf7910bbe 100644
> > --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> > +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> > @@ -62,7 +62,7 @@ static int tfp410_get_modes(struct drm_connector *connector)
> > goto fallback;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > return drm_add_edid_modes(connector, edid);
> > fallback:
> > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> > index dc5a480200d8..ccb70a4490d3 100644
> > --- a/drivers/gpu/drm/drm_connector.c
> > +++ b/drivers/gpu/drm/drm_connector.c
> > @@ -818,7 +818,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
> > * Blob property which contains the current EDID read from the sink. This
> > * is useful to parse sink identification information like vendor, model
> > * and serial. Drivers should update this property by calling
> > - * drm_mode_connector_update_edid_property(), usually after having parsed
> > + * drm_connector_update_edid_property(), usually after having parsed
> > * the EDID using drm_add_edid_modes(). Userspace cannot change this
> > * property.
> > * DPMS:
> > @@ -1501,7 +1501,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> > EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> >
> > /**
> > - * drm_mode_connector_update_edid_property - update the edid property of a connector
> > + * drm_connector_update_edid_property - update the edid property of a connector
> > * @connector: drm connector
> > * @edid: new value of the edid property
> > *
> > @@ -1511,7 +1511,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> > * Returns:
> > * Zero on success, negative errno on failure.
> > */
> > -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > +int drm_connector_update_edid_property(struct drm_connector *connector,
> > const struct edid *edid)
> > {
> > struct drm_device *dev = connector->dev;
> > @@ -1550,7 +1550,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > dev->mode_config.edid_property);
> > return ret;
> > }
> > -EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
> > +EXPORT_SYMBOL(drm_connector_update_edid_property);
> >
> > /**
> > * drm_mode_connector_set_link_status_property - Set link status property of a connector
> > diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> > index b2482818fee8..df8ca4548f9f 100644
> > --- a/drivers/gpu/drm/drm_debugfs.c
> > +++ b/drivers/gpu/drm/drm_debugfs.c
> > @@ -307,13 +307,13 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
> >
> > if (len == 5 && !strncmp(buf, "reset", 5)) {
> > connector->override_edid = false;
> > - ret = drm_mode_connector_update_edid_property(connector, NULL);
> > + ret = drm_connector_update_edid_property(connector, NULL);
> > } else if (len < EDID_LENGTH ||
> > EDID_LENGTH * (1 + edid->extensions) > len)
> > ret = -EINVAL;
> > else {
> > connector->override_edid = false;
> > - ret = drm_mode_connector_update_edid_property(connector, edid);
> > + ret = drm_connector_update_edid_property(connector, edid);
> > if (!ret)
> > connector->override_edid = true;
> > }
> > diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> > index 1a901fe9e23e..3470ca507df3 100644
> > --- a/drivers/gpu/drm/drm_probe_helper.c
> > +++ b/drivers/gpu/drm/drm_probe_helper.c
> > @@ -471,7 +471,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> > if (connector->status == connector_status_disconnected) {
> > DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
> > connector->base.id, connector->name);
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > verbose_prune = false;
> > goto prune;
> > }
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > index e6b0940b1ac2..dfea61edba4a 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > @@ -319,7 +319,7 @@ static int vidi_get_modes(struct drm_connector *connector)
> > return -ENOMEM;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > return drm_add_edid_modes(connector, edid);
> > }
> > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > index db91932550cf..6672d0ff0423 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > @@ -888,7 +888,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
> > (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
> > edid->width_cm, edid->height_cm);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
> >
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > index 5ea785f07ba8..90ed20083009 100644
> > --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > @@ -1770,7 +1770,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &intel_dp->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > index f0878998526a..4e4e4a66eaee 100644
> > --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > @@ -216,7 +216,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > index 78566a80ad25..c6d72de1c054 100644
> > --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > @@ -578,7 +578,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
> > }
> >
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > }
> > return ret;
> > diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > index e6943fef0611..83babb815a5d 100644
> > --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > @@ -376,7 +376,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
> > * preferred mode is the right one.
> > */
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
> > index e5360726d80b..fb4da3cd6681 100644
> > --- a/drivers/gpu/drm/gma500/psb_intel_modes.c
> > +++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
> > @@ -66,7 +66,7 @@ int psb_intel_ddc_get_modes(struct drm_connector *connector,
> >
> > edid = drm_get_edid(connector, adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > index 1d40746ab625..dd3cec0e3190 100644
> > --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > @@ -1472,7 +1472,7 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> > bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
> >
> > if (connector_is_digital == monitor_is_digital) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> > index 0038c976536a..d434f576e6b2 100644
> > --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> > +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> > @@ -1243,7 +1243,7 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
> > return 0;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > n = drm_add_edid_modes(connector, edid);
> >
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 5be07e1d816d..2f3e92167c5f 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -6212,7 +6212,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> > edid = drm_get_edid(connector, &intel_dp->aux.ddc);
> > if (edid) {
> > if (drm_add_edid_modes(connector, edid)) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > } else {
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> > index bb06744d28a4..ca55b0a82ba6 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > @@ -1131,7 +1131,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> > intel_gmbus_get_adapter(dev_priv, pin));
> > if (edid) {
> > if (drm_add_edid_modes(connector, edid)) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > } else {
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
> > index b39846613e3c..ca44bf368e24 100644
> > --- a/drivers/gpu/drm/i915/intel_modes.c
> > +++ b/drivers/gpu/drm/i915/intel_modes.c
> > @@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
> > {
> > int ret;
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> >
> > return ret;
> > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> > index 396cb59ca4b8..812fe7b06f87 100644
> > --- a/drivers/gpu/drm/i915/intel_sdvo.c
> > +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> > @@ -1911,7 +1911,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> > if (edid != NULL) {
> > if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
> > edid)) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> > index 56dd7a9a8e25..ae81cbb75f51 100644
> > --- a/drivers/gpu/drm/imx/imx-ldb.c
> > +++ b/drivers/gpu/drm/imx/imx-ldb.c
> > @@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
> > imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
> >
> > if (imx_ldb_ch->edid) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > imx_ldb_ch->edid);
> > num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
> > }
> > diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> > index bc27c2699464..1a4ced5c09b5 100644
> > --- a/drivers/gpu/drm/imx/imx-tve.c
> > +++ b/drivers/gpu/drm/imx/imx-tve.c
> > @@ -235,7 +235,7 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, tve->ddc);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> > index aedecda9728a..4fc1cf583435 100644
> > --- a/drivers/gpu/drm/imx/parallel-display.c
> > +++ b/drivers/gpu/drm/imx/parallel-display.c
> > @@ -63,7 +63,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
> > }
> >
> > if (imxpd->edid) {
> > - drm_mode_connector_update_edid_property(connector, imxpd->edid);
> > + drm_connector_update_edid_property(connector, imxpd->edid);
> > num_modes = drm_add_edid_modes(connector, imxpd->edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > index 59a11026dceb..835313940395 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > @@ -1220,7 +1220,7 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
> >
> > hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
> >
> > - drm_mode_connector_update_edid_property(conn, edid);
> > + drm_connector_update_edid_property(conn, edid);
> >
> > ret = drm_add_edid_modes(conn, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> > index 8918539a19aa..5f104f139197 100644
> > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> > @@ -1553,7 +1553,7 @@ static int mga_vga_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &mga_connector->i2c->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> > index 6f3fc6b0f0a3..0b5eac054195 100644
> > --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> > +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> > @@ -56,7 +56,7 @@ static int edp_connector_get_modes(struct drm_connector *connector)
> > if (ret)
> > return ret;
> >
> > - drm_mode_connector_update_edid_property(connector, drm_edid);
> > + drm_connector_update_edid_property(connector, drm_edid);
> > if (drm_edid)
> > ret = drm_add_edid_modes(connector, drm_edid);
> >
> > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > index c0848dfedd50..07feacc5a441 100644
> > --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > @@ -392,7 +392,7 @@ static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
> > hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
> >
> > hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > index b83465ae7c1b..2fabb69e452b 100644
> > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > @@ -850,7 +850,7 @@ nv50_mstc_get_modes(struct drm_connector *connector)
> > int ret = 0;
> >
> > mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
> > - drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
> > + drm_connector_update_edid_property(&mstc->connector, mstc->edid);
> > if (mstc->edid)
> > ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
> >
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> > index bb46c1d489cf..22a15478d23d 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> > @@ -550,7 +550,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> >
> > /* Cleanup the previous EDID block. */
> > if (nv_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > kfree(nv_connector->edid);
> > nv_connector->edid = NULL;
> > }
> > @@ -575,7 +575,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> > else
> > nv_connector->edid = drm_get_edid(connector, i2c);
> >
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > nv_connector->edid);
> > if (!nv_connector->edid) {
> > NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
> > @@ -657,7 +657,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
> >
> > /* Cleanup the previous EDID block. */
> > if (nv_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > kfree(nv_connector->edid);
> > nv_connector->edid = NULL;
> > }
> > @@ -721,7 +721,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
> > status = connector_status_unknown;
> > #endif
> >
> > - drm_mode_connector_update_edid_property(connector, nv_connector->edid);
> > + drm_connector_update_edid_property(connector, nv_connector->edid);
> > nouveau_connector_set_encoder(connector, nv_encoder);
> > return status;
> > }
> > diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
> > index 5cde26ac937b..2ddb856666c4 100644
> > --- a/drivers/gpu/drm/omapdrm/omap_connector.c
> > +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
> > @@ -126,14 +126,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
> >
> > if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
> > drm_edid_is_valid(edid)) {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > connector, edid);
> > n = drm_add_edid_modes(connector, edid);
> >
> > omap_connector->hdmi_mode =
> > drm_detect_hdmi_monitor(edid);
> > } else {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > connector, NULL);
> > }
> >
> > diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
> > index ac6aaa174c0b..3c229d134359 100644
> > --- a/drivers/gpu/drm/panel/panel-simple.c
> > +++ b/drivers/gpu/drm/panel/panel-simple.c
> > @@ -252,7 +252,7 @@ static int panel_simple_get_modes(struct drm_panel *panel)
> > /* probe EDID if a DDC bus is available */
> > if (p->ddc) {
> > struct edid *edid = drm_get_edid(panel->connector, p->ddc);
> > - drm_mode_connector_update_edid_property(panel->connector, edid);
> > + drm_connector_update_edid_property(panel->connector, edid);
> > if (edid) {
> > num += drm_add_edid_modes(panel->connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> > index 0655698f2956..414642e5b7a3 100644
> > --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> > +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> > @@ -368,11 +368,11 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)
> > int ret;
> >
> > if (radeon_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, radeon_connector->edid);
> > + drm_connector_update_edid_property(connector, radeon_connector->edid);
> > ret = drm_add_edid_modes(connector, radeon_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > index cd8a3ee16649..37956cfc0b6d 100644
> > --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > @@ -195,11 +195,11 @@ static int radeon_dp_mst_get_ddc_modes(struct drm_connector *connector)
> > radeon_connector->edid = edid;
> > DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> > if (radeon_connector->edid) {
> > - drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> > + drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> > ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
> > + drm_connector_update_edid_property(&radeon_connector->base, NULL);
> >
> > return ret;
> > }
> > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > index c6fbdcd87c16..a40cb2be50e1 100644
> > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > @@ -275,7 +275,7 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
> > dp->sink_has_audio = drm_detect_monitor_audio(edid);
> > ret = drm_add_edid_modes(connector, edid);
> > if (ret)
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > }
> > mutex_unlock(&dp->lock);
> > diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> > index 88d0774c97bd..510fcb33e31d 100644
> > --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> > +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> > @@ -565,7 +565,7 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
> > if (edid) {
> > hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> > index 58f431102512..0c3008356ab8 100644
> > --- a/drivers/gpu/drm/sti/sti_hdmi.c
> > +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> > @@ -977,7 +977,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
> > cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
> >
> > count = drm_add_edid_modes(connector, edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > kfree(edid);
> > return count;
> > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > index fa4bcd092eaf..9b4b1d015423 100644
> > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > @@ -220,7 +220,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)
> > DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
> > hdmi->hdmi_monitor ? "an HDMI" : "a DVI");
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
> > index ffe34bd0bb9d..983657c47067 100644
> > --- a/drivers/gpu/drm/tegra/output.c
> > +++ b/drivers/gpu/drm/tegra/output.c
> > @@ -37,7 +37,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
> > edid = drm_get_edid(connector, output->ddc);
> >
> > cec_notifier_set_phys_addr_from_edid(output->notifier, edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > err = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > index c45cabb38db0..46dacca3cce8 100644
> > --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > @@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> > index 09dc585aa46f..8fac12e1a1a4 100644
> > --- a/drivers/gpu/drm/udl/udl_connector.c
> > +++ b/drivers/gpu/drm/udl/udl_connector.c
> > @@ -99,7 +99,7 @@ static int udl_get_modes(struct drm_connector *connector)
> > struct udl_drm_connector,
> > connector);
> >
> > - drm_mode_connector_update_edid_property(connector, udl_connector->edid);
> > + drm_connector_update_edid_property(connector, udl_connector->edid);
> > if (udl_connector->edid)
> > return drm_add_edid_modes(connector, udl_connector->edid);
> > return 0;
> > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> > index b8d50533e2bb..91f284e1b908 100644
> > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> > @@ -285,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
> > drm_rgb_quant_range_selectable(edid);
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> > index 13ea90f7a185..d073c6737500 100644
> > --- a/drivers/gpu/drm/zte/zx_hdmi.c
> > +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> > @@ -272,7 +272,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)
> >
> > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> > index 3e7e33cd3dfa..3e78ee21b8d0 100644
> > --- a/drivers/gpu/drm/zte/zx_vga.c
> > +++ b/drivers/gpu/drm/zte/zx_vga.c
> > @@ -109,7 +109,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)
> > */
> > zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
> > index 5c7ea237893e..a943d2f683ed 100644
> > --- a/drivers/staging/vboxvideo/vbox_mode.c
> > +++ b/drivers/staging/vboxvideo/vbox_mode.c
> > @@ -504,7 +504,7 @@ static void vbox_set_edid(struct drm_connector *connector, int width,
> > for (i = 0; i < EDID_SIZE - 1; ++i)
> > sum += edid[i];
> > edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
> > - drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
> > + drm_connector_update_edid_property(connector, (struct edid *)edid);
> > }
> >
> > static int vbox_get_modes(struct drm_connector *connector)
> > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> > index a0300e3468cb..9841d2b6d3eb 100644
> > --- a/include/drm/drm_connector.h
> > +++ b/include/drm/drm_connector.h
> > @@ -892,7 +892,7 @@ struct drm_connector {
> > /**
> > * @edid_blob_ptr: DRM property containing EDID if present. Protected by
> > * &drm_mode_config.mutex. This should be updated only by calling
> > - * drm_mode_connector_update_edid_property().
> > + * drm_connector_update_edid_property().
> > */
> > struct drm_property_blob *edid_blob_ptr;
> >
> > @@ -1190,8 +1190,8 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
> > int drm_mode_connector_set_path_property(struct drm_connector *connector,
> > const char *path);
> > int drm_mode_connector_set_tile_property(struct drm_connector *connector);
> > -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > - const struct edid *edid);
> > +int drm_connector_update_edid_property(struct drm_connector *connector,
> > + const struct edid *edid);
> > void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> > uint64_t link_status);
> > int drm_connector_init_panel_orientation_property(
> > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> > index 3b289773297c..5873d15821cf 100644
> > --- a/include/drm/drm_modeset_helper_vtables.h
> > +++ b/include/drm/drm_modeset_helper_vtables.h
> > @@ -785,7 +785,7 @@ struct drm_connector_helper_funcs {
> > *
> > * This function should fill in all modes currently valid for the sink
> > * into the &drm_connector.probed_modes list. It should also update the
> > - * EDID property by calling drm_mode_connector_update_edid_property().
> > + * EDID property by calling drm_connector_update_edid_property().
> > *
> > * The usual way to implement this is to cache the EDID retrieved in the
> > * probe callback somewhere in the driver-private connector structure.
> > --
> > 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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
