Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e14fbe authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: drop _mode_ from remaining connector functions 



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.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-8-daniel.vetter@ffwll.ch
parent cde4c44d

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

+3 −3
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/drm_atomic_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -2867,7 +2867,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.

drivers/gpu/drm/drm_connector.c

+18 −18
Original line number Diff line number Diff line
@@ -852,7 +852,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:
@@ -863,14 +863,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
@@ -1425,7 +1425,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.

 *
@@ -1437,7 +1437,7 @@ 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,

int drm_connector_set_path_property(struct drm_connector *connector,

				    const char *path)

{

	struct drm_device *dev = connector->dev;
@@ -1451,10 +1451,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
@@ -1464,7 +1464,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];
@@ -1494,7 +1494,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
@@ -1549,7 +1549,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)

 *
@@ -1567,7 +1567,7 @@ 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,

void drm_connector_set_link_status_property(struct drm_connector *connector,

					    uint64_t link_status)

{

	struct drm_device *dev = connector->dev;
@@ -1576,7 +1576,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 -
@@ -1629,7 +1629,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)

{
@@ -1647,7 +1647,7 @@ 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,

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;

drivers/gpu/drm/drm_crtc_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -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,7 +156,7 @@ 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,

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);

drivers/gpu/drm/drm_dp_mst_topology.c

+2 −2
Original line number Diff line number Diff line
@@ -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);