[PATCH 07/15] drm: drop _mode_ from remaining connector functions

Sean Paul seanpaul at chromium.org
Fri Jul 13 15:05:38 UTC 2018


On Mon, Jul 09, 2018 at 10:40:08AM +0200, Daniel Vetter wrote:
> Since there's very few callers of these I've decided to do them all in
> one patch. With this the unecessarily long drm_mode_connector_ prefix
> is gone from the codebase! The only exception being struct
> drm_mode_connector_set_property, which is part of the uapi so can't be
> renamed.
> 
> Again done with sed+some manual fixups for indent issues.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>

LGTM. There's an unrelated indent change in the arguments of
drm_connector_update_edid_property(), but it's an improvement, so I won't
nitpick it :-)

Reviewed-by: Sean Paul <seanpaul at chromium.org>


> ---
>  .../display/amdgpu_dm/amdgpu_dm_mst_types.c   |  6 ++--
>  drivers/gpu/drm/drm_atomic_helper.c           |  2 +-
>  drivers/gpu/drm/drm_connector.c               | 36 +++++++++----------
>  drivers/gpu/drm/drm_crtc_internal.h           |  6 ++--
>  drivers/gpu/drm/drm_dp_mst_topology.c         |  4 +--
>  drivers/gpu/drm/drm_ioctl.c                   |  2 +-
>  drivers/gpu/drm/drm_mode_object.c             |  3 +-
>  drivers/gpu/drm/drm_modes.c                   |  6 ++--
>  drivers/gpu/drm/drm_probe_helper.c            |  4 +--
>  drivers/gpu/drm/i915/intel_dp.c               |  4 +--
>  drivers/gpu/drm/i915/intel_dp_mst.c           |  2 +-
>  drivers/gpu/drm/msm/dsi/dsi_manager.c         |  2 +-
>  drivers/gpu/drm/nouveau/dispnv50/disp.c       |  2 +-
>  drivers/gpu/drm/radeon/radeon_dp_mst.c        |  2 +-
>  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c           |  2 +-
>  include/drm/drm_connector.h                   | 14 ++++----
>  include/drm/drm_modes.h                       |  2 +-
>  17 files changed, 49 insertions(+), 50 deletions(-)
> 
> 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 581bb75d08eb..65f210d3497b 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
> @@ -345,7 +345,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
>  						aconnector, connector->base.id, aconnector->mst_port);
>  
>  			aconnector->port = port;
> -			drm_mode_connector_set_path_property(connector, pathprop);
> +			drm_connector_set_path_property(connector, pathprop);
>  
>  			drm_connector_list_iter_end(&conn_iter);
>  			aconnector->mst_connected = true;
> @@ -393,7 +393,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
>  		dev->mode_config.tile_property,
>  		0);
>  
> -	drm_mode_connector_set_path_property(connector, pathprop);
> +	drm_connector_set_path_property(connector, pathprop);
>  
>  	/*
>  	 * Initialize connector state before adding the connectror to drm and
> @@ -441,7 +441,7 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)
>  static void dm_dp_mst_link_status_reset(struct drm_connector *connector)
>  {
>  	mutex_lock(&connector->dev->mode_config.mutex);
> -	drm_mode_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
> +	drm_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
>  	mutex_unlock(&connector->dev->mode_config.mutex);
>  }
>  
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 5bc88f361fef..acf9dbd9fed2 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2809,7 +2809,7 @@ static int update_output_state(struct drm_atomic_state *state,
>   * resets the "link-status" property to GOOD, to force any link
>   * re-training. The SETCRTC ioctl does not define whether an update does
>   * need a full modeset or just a plane update, hence we're allowed to do
> - * that. See also drm_mode_connector_set_link_status_property().
> + * that. See also drm_connector_set_link_status_property().
>   *
>   * Returns:
>   * Returns 0 on success, negative errno numbers on failure.
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 43cd636d83b5..93647161f9e6 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -856,7 +856,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
>   * PATH:
>   * 	Connector path property to identify how this sink is physically
>   * 	connected. Used by DP MST. This should be set by calling
> - * 	drm_mode_connector_set_path_property(), in the case of DP MST with the
> + * 	drm_connector_set_path_property(), in the case of DP MST with the
>   * 	path property the MST manager created. Userspace cannot change this
>   * 	property.
>   * TILE:
> @@ -867,14 +867,14 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
>   * 	are not gen-locked. Note that for tiled panels which are genlocked, like
>   * 	dual-link LVDS or dual-link DSI, the driver should try to not expose the
>   * 	tiling and virtualize both &drm_crtc and &drm_plane if needed. Drivers
> - * 	should update this value using drm_mode_connector_set_tile_property().
> + * 	should update this value using drm_connector_set_tile_property().
>   * 	Userspace cannot change this property.
>   * link-status:
>   *      Connector link-status property to indicate the status of link. The
>   *      default value of link-status is "GOOD". If something fails during or
>   *      after modeset, the kernel driver may set this to "BAD" and issue a
>   *      hotplug uevent. Drivers should update this value using
> - *      drm_mode_connector_set_link_status_property().
> + *      drm_connector_set_link_status_property().
>   * non_desktop:
>   * 	Indicates the output should be ignored for purposes of displaying a
>   * 	standard desktop environment or console. This is most likely because
> @@ -1429,7 +1429,7 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev)
>  EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
>  
>  /**
> - * drm_mode_connector_set_path_property - set tile property on connector
> + * drm_connector_set_path_property - set tile property on connector
>   * @connector: connector to set property on.
>   * @path: path to use for property; must not be NULL.
>   *
> @@ -1441,8 +1441,8 @@ EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
>   * Returns:
>   * Zero on success, negative errno on failure.
>   */
> -int drm_mode_connector_set_path_property(struct drm_connector *connector,
> -					 const char *path)
> +int drm_connector_set_path_property(struct drm_connector *connector,
> +				    const char *path)
>  {
>  	struct drm_device *dev = connector->dev;
>  	int ret;
> @@ -1455,10 +1455,10 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector,
>  	                                       dev->mode_config.path_property);
>  	return ret;
>  }
> -EXPORT_SYMBOL(drm_mode_connector_set_path_property);
> +EXPORT_SYMBOL(drm_connector_set_path_property);
>  
>  /**
> - * drm_mode_connector_set_tile_property - set tile property on connector
> + * drm_connector_set_tile_property - set tile property on connector
>   * @connector: connector to set property on.
>   *
>   * This looks up the tile information for a connector, and creates a
> @@ -1468,7 +1468,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property);
>   * Returns:
>   * Zero on success, errno on failure.
>   */
> -int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> +int drm_connector_set_tile_property(struct drm_connector *connector)
>  {
>  	struct drm_device *dev = connector->dev;
>  	char tile[256];
> @@ -1498,7 +1498,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
>  	                                       dev->mode_config.tile_property);
>  	return ret;
>  }
> -EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> +EXPORT_SYMBOL(drm_connector_set_tile_property);
>  
>  /**
>   * drm_connector_update_edid_property - update the edid property of a connector
> @@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
>   * Zero on success, negative errno on failure.
>   */
>  int drm_connector_update_edid_property(struct drm_connector *connector,
> -					    const struct edid *edid)
> +				       const struct edid *edid)
>  {
>  	struct drm_device *dev = connector->dev;
>  	size_t size = 0;
> @@ -1553,7 +1553,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
>  EXPORT_SYMBOL(drm_connector_update_edid_property);
>  
>  /**
> - * drm_mode_connector_set_link_status_property - Set link status property of a connector
> + * drm_connector_set_link_status_property - Set link status property of a connector
>   * @connector: drm connector
>   * @link_status: new value of link status property (0: Good, 1: Bad)
>   *
> @@ -1571,8 +1571,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property);
>   * it is not limited to DP or link training. For example, if we implement
>   * asynchronous setcrtc, this property can be used to report any failures in that.
>   */
> -void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> -						 uint64_t link_status)
> +void drm_connector_set_link_status_property(struct drm_connector *connector,
> +					    uint64_t link_status)
>  {
>  	struct drm_device *dev = connector->dev;
>  
> @@ -1580,7 +1580,7 @@ void drm_mode_connector_set_link_status_property(struct drm_connector *connector
>  	connector->state->link_status = link_status;
>  	drm_modeset_unlock(&dev->mode_config.connection_mutex);
>  }
> -EXPORT_SYMBOL(drm_mode_connector_set_link_status_property);
> +EXPORT_SYMBOL(drm_connector_set_link_status_property);
>  
>  /**
>   * drm_connector_init_panel_orientation_property -
> @@ -1633,7 +1633,7 @@ int drm_connector_init_panel_orientation_property(
>  }
>  EXPORT_SYMBOL(drm_connector_init_panel_orientation_property);
>  
> -int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> +int drm_connector_set_obj_prop(struct drm_mode_object *obj,
>  				    struct drm_property *property,
>  				    uint64_t value)
>  {
> @@ -1651,8 +1651,8 @@ int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
>  	return ret;
>  }
>  
> -int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
> -				       void *data, struct drm_file *file_priv)
> +int drm_connector_property_set_ioctl(struct drm_device *dev,
> +				     void *data, struct drm_file *file_priv)
>  {
>  	struct drm_mode_connector_set_property *conn_set_prop = data;
>  	struct drm_mode_obj_set_property obj_set_prop = {
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index 235d40fce8b5..b61322763394 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -148,7 +148,7 @@ void drm_connector_ida_init(void);
>  void drm_connector_ida_destroy(void);
>  void drm_connector_unregister_all(struct drm_device *dev);
>  int drm_connector_register_all(struct drm_device *dev);
> -int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> +int drm_connector_set_obj_prop(struct drm_mode_object *obj,
>  				    struct drm_property *property,
>  				    uint64_t value);
>  int drm_connector_create_standard_properties(struct drm_device *dev);
> @@ -156,8 +156,8 @@ const char *drm_get_connector_force_name(enum drm_connector_force force);
>  void drm_connector_free_work_fn(struct work_struct *work);
>  
>  /* IOCTL */
> -int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
> -					  void *data, struct drm_file *file_priv);
> +int drm_connector_property_set_ioctl(struct drm_device *dev,
> +				     void *data, struct drm_file *file_priv);
>  int drm_mode_getconnector(struct drm_device *dev,
>  			  void *data, struct drm_file *file_priv);
>  
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 658830620ca3..7780567aa669 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -1215,7 +1215,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
>  		     port->pdt == DP_PEER_DEVICE_SST_SINK) &&
>  		    port->port_num >= DP_MST_LOGICAL_PORT_0) {
>  			port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
> -			drm_mode_connector_set_tile_property(port->connector);
> +			drm_connector_set_tile_property(port->connector);
>  		}
>  		(*mstb->mgr->cbs->register_connector)(port->connector);
>  	}
> @@ -2559,7 +2559,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
>  		edid = drm_edid_duplicate(port->cached_edid);
>  	else {
>  		edid = drm_get_edid(connector, &port->aux.ddc);
> -		drm_mode_connector_set_tile_property(connector);
> +		drm_connector_set_tile_property(connector);
>  	}
>  	port->has_audio = drm_detect_monitor_audio(edid);
>  	drm_dp_put_port(port);
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index c148eb3be8c2..882777fa66fa 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -641,7 +641,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_UNLOCKED),
> -	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
> +	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED),
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED),
>  	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED),
> diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c
> index ce4d2fb32810..fcb0ab0abb75 100644
> --- a/drivers/gpu/drm/drm_mode_object.c
> +++ b/drivers/gpu/drm/drm_mode_object.c
> @@ -433,8 +433,7 @@ static int set_property_legacy(struct drm_mode_object *obj,
>  	drm_modeset_lock_all(dev);
>  	switch (obj->type) {
>  	case DRM_MODE_OBJECT_CONNECTOR:
> -		ret = drm_mode_connector_set_obj_prop(obj, prop,
> -						      prop_value);
> +		ret = drm_connector_set_obj_prop(obj, prop, prop_value);
>  		break;
>  	case DRM_MODE_OBJECT_CRTC:
>  		ret = drm_mode_crtc_set_obj_prop(obj, prop, prop_value);
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index 7f552d5fa88e..6590e65d0b49 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -1346,7 +1346,7 @@ void drm_mode_sort(struct list_head *mode_list)
>  EXPORT_SYMBOL(drm_mode_sort);
>  
>  /**
> - * drm_mode_connector_list_update - update the mode list for the connector
> + * drm_connector_list_update - update the mode list for the connector
>   * @connector: the connector to update
>   *
>   * This moves the modes from the @connector probed_modes list
> @@ -1356,7 +1356,7 @@ EXPORT_SYMBOL(drm_mode_sort);
>   * This is just a helper functions doesn't validate any modes itself and also
>   * doesn't prune any invalid modes. Callers need to do that themselves.
>   */
> -void drm_mode_connector_list_update(struct drm_connector *connector)
> +void drm_connector_list_update(struct drm_connector *connector)
>  {
>  	struct drm_display_mode *pmode, *pt;
>  
> @@ -1405,7 +1405,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector)
>  		}
>  	}
>  }
> -EXPORT_SYMBOL(drm_mode_connector_list_update);
> +EXPORT_SYMBOL(drm_connector_list_update);
>  
>  /**
>   * drm_mode_parse_command_line_for_connector - parse command line modeline for connector
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 3470ca507df3..7666e4b37d44 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -359,7 +359,7 @@ EXPORT_SYMBOL(drm_helper_probe_detect);
>   *    using the VESA GTF/CVT formulas.
>   *
>   * 3. Modes are moved from the probed_modes list to the modes list. Potential
> - *    duplicates are merged together (see drm_mode_connector_list_update()).
> + *    duplicates are merged together (see drm_connector_list_update()).
>   *    After this step the probed_modes list will be empty again.
>   *
>   * 4. Any non-stale mode on the modes list then undergoes validation
> @@ -484,7 +484,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
>  	if (count == 0)
>  		goto prune;
>  
> -	drm_mode_connector_list_update(connector);
> +	drm_connector_list_update(connector);
>  
>  	if (connector->interlace_allowed)
>  		mode_flags |= DRM_MODE_FLAG_INTERLACE;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 2f3e92167c5f..10150ce859ad 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -6301,8 +6301,8 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work)
>  	/* Set connector link status to BAD and send a Uevent to notify
>  	 * userspace to do a modeset.
>  	 */
> -	drm_mode_connector_set_link_status_property(connector,
> -						    DRM_MODE_LINK_STATUS_BAD);
> +	drm_connector_set_link_status_property(connector,
> +					       DRM_MODE_LINK_STATUS_BAD);
>  	mutex_unlock(&connector->dev->mode_config.mutex);
>  	/* Send Hotplug uevent so userspace can reprobe */
>  	drm_kms_helper_hotplug_event(connector->dev);
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 494e5c40a464..7e3e01607643 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -474,7 +474,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>  	drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
>  	drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
>  
> -	ret = drm_mode_connector_set_path_property(connector, pathprop);
> +	ret = drm_connector_set_path_property(connector, pathprop);
>  	if (ret)
>  		goto err;
>  
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index 21e0dc51531d..d5006d6923e0 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -393,7 +393,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)
>  		ret = dsi_dual_connector_tile_init(connector, id);
>  		if (ret)
>  			return ret;
> -		ret = drm_mode_connector_set_tile_property(connector);
> +		ret = drm_connector_set_tile_property(connector);
>  		if (ret) {
>  			pr_err("%s: set tile property failed, %d\n",
>  					__func__, ret);
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 475456c19b76..5a247eb71899 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -931,7 +931,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
>  
>  	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);
> -	drm_mode_connector_set_path_property(&mstc->connector, path);
> +	drm_connector_set_path_property(&mstc->connector, path);
>  	return 0;
>  }
>  
> diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> index 37956cfc0b6d..f920be236cc9 100644
> --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> @@ -290,7 +290,7 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
>  
>  	drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
>  	drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
> -	drm_mode_connector_set_path_property(connector, pathprop);
> +	drm_connector_set_path_property(connector, pathprop);
>  
>  	return connector;
>  }
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> index bc5fbd39cf9a..4a0f0f41afa1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -2114,7 +2114,7 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
>  		drm_mode_probed_add(connector, mode);
>  	}
>  
> -	drm_mode_connector_list_update(connector);
> +	drm_connector_list_update(connector);
>  	/* Move the prefered mode first, help apps pick the right mode. */
>  	drm_mode_sort(&connector->modes);
>  
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index dfd7a3595a6c..012d2f2d1f88 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -915,7 +915,7 @@ struct drm_connector {
>  	 * @path_blob_ptr:
>  	 *
>  	 * DRM blob property data for the DP MST path property. This should only
> -	 * be updated by calling drm_mode_connector_set_path_property().
> +	 * be updated by calling drm_connector_set_path_property().
>  	 */
>  	struct drm_property_blob *path_blob_ptr;
>  
> @@ -1042,7 +1042,7 @@ struct drm_connector {
>  	 * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
>  	 *
>  	 * This should only be updated by calling
> -	 * drm_mode_connector_set_tile_property().
> +	 * drm_connector_set_tile_property().
>  	 */
>  	struct drm_property_blob *tile_blob_ptr;
>  
> @@ -1187,13 +1187,13 @@ void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
>  
>  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_connector_set_path_property(struct drm_connector *connector,
> +				    const char *path);
> +int drm_connector_set_tile_property(struct drm_connector *connector);
>  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);
> +void drm_connector_set_link_status_property(struct drm_connector *connector,
> +					    uint64_t link_status);
>  int drm_connector_init_panel_orientation_property(
>  	struct drm_connector *connector, int width, int height);
>  
> diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> index b159fe07fcf9..baded6514456 100644
> --- a/include/drm/drm_modes.h
> +++ b/include/drm/drm_modes.h
> @@ -530,7 +530,7 @@ drm_mode_validate_ycbcr420(const struct drm_display_mode *mode,
>  void drm_mode_prune_invalid(struct drm_device *dev,
>  			    struct list_head *mode_list, bool verbose);
>  void drm_mode_sort(struct list_head *mode_list);
> -void drm_mode_connector_list_update(struct drm_connector *connector);
> +void drm_connector_list_update(struct drm_connector *connector);
>  
>  /* parsing cmdline modes */
>  bool
> -- 
> 2.18.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Sean Paul, Software Engineer, Google / Chromium OS


More information about the dri-devel mailing list