Commit b2feb1d6 authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/dp_mst: Rename drm_dp_mst_is_dp_mst_end_device() to be less redundant 



It's already prefixed by dp_mst, so we don't really need to repeat
ourselves here. One of the changes I should have picked up originally
when reviewing MST DSC support.

There should be no functional changes here

Cc: Mikita Lipski <mikita.lipski@amd.com>
Cc: Sean Paul <seanpaul@google.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200306234623.547525-2-lyude@redhat.com
parent e3c3b6e6

drivers/gpu/drm/drm_dp_mst_topology.c

+5 −5
Original line number Diff line number Diff line
@@ -1935,7 +1935,7 @@ static u8 drm_dp_calculate_rad(struct drm_dp_mst_port *port, 
	return parent_lct + 1;

}



static bool drm_dp_mst_is_dp_mst_end_device(u8 pdt, bool mcs)

static bool drm_dp_mst_is_end_device(u8 pdt, bool mcs)

{

	switch (pdt) {

	case DP_PEER_DEVICE_DP_LEGACY_CONV:
@@ -1965,13 +1965,13 @@ drm_dp_port_set_pdt(struct drm_dp_mst_port *port, u8 new_pdt, 


	/* Teardown the old pdt, if there is one */

	if (port->pdt != DP_PEER_DEVICE_NONE) {

		if (drm_dp_mst_is_dp_mst_end_device(port->pdt, port->mcs)) {

		if (drm_dp_mst_is_end_device(port->pdt, port->mcs)) {

			/*

			 * If the new PDT would also have an i2c bus,

			 * don't bother with reregistering it

			 */

			if (new_pdt != DP_PEER_DEVICE_NONE &&

			    drm_dp_mst_is_dp_mst_end_device(new_pdt, new_mcs)) {

			    drm_dp_mst_is_end_device(new_pdt, new_mcs)) {

				port->pdt = new_pdt;

				port->mcs = new_mcs;

				return 0;
@@ -1991,7 +1991,7 @@ drm_dp_port_set_pdt(struct drm_dp_mst_port *port, u8 new_pdt, 
	port->mcs = new_mcs;



	if (port->pdt != DP_PEER_DEVICE_NONE) {

		if (drm_dp_mst_is_dp_mst_end_device(port->pdt, port->mcs)) {

		if (drm_dp_mst_is_end_device(port->pdt, port->mcs)) {

			/* add i2c over sideband */

			ret = drm_dp_mst_register_i2c_bus(&port->aux);

		} else {
@@ -2172,7 +2172,7 @@ drm_dp_mst_port_add_connector(struct drm_dp_mst_branch *mstb, 
	}



	if (port->pdt != DP_PEER_DEVICE_NONE &&

	    drm_dp_mst_is_dp_mst_end_device(port->pdt, port->mcs)) {

	    drm_dp_mst_is_end_device(port->pdt, port->mcs)) {

		port->cached_edid = drm_get_edid(port->connector,

						 &port->aux.ddc);

		drm_connector_set_tile_property(port->connector);

CRA Git | Maintained and supported by SUSTech CRA and CCSE