Commit f0127cb1 authored by Wayne Lin's avatar Wayne Lin Committed by Alex Deucher
Browse files

drm/amdgpu/display/mst: adjust the naming of mst_port and port of aconnector 



[why & how]
The term (i.e. port & mst_port) that we used to use in amdgpu is a bit
confusing. Rename them to mst_output_port & mst_root respectively.

Signed-off-by: default avatarWayne Lin <Wayne.Lin@amd.com>
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b2d0191

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+2 −2
Original line number Diff line number Diff line
@@ -550,8 +550,8 @@ struct amdgpu_mst_connector { 


	struct drm_dp_mst_topology_mgr mst_mgr;

	struct amdgpu_dm_dp_aux dm_dp_aux;

	struct drm_dp_mst_port *port;

	struct amdgpu_connector *mst_port;

	struct drm_dp_mst_port *mst_output_port;

	struct amdgpu_connector *mst_root;

	bool is_mst_connector;

	struct amdgpu_encoder *mst_encoder;

};

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

+12 −12
Original line number Diff line number Diff line
@@ -2233,7 +2233,7 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend) 
	drm_for_each_connector_iter(connector, &iter) {

		aconnector = to_amdgpu_dm_connector(connector);

		if (aconnector->dc_link->type != dc_connection_mst_branch ||

		    aconnector->mst_port)

		    aconnector->mst_root)

			continue;



		mgr = &aconnector->mst_mgr;
@@ -6628,11 +6628,11 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, 
	int clock, bpp = 0;

	bool is_y420 = false;



	if (!aconnector->port || !aconnector->dc_sink)

	if (!aconnector->mst_output_port || !aconnector->dc_sink)

		return 0;



	mst_port = aconnector->port;

	mst_mgr = &aconnector->mst_port->mst_mgr;

	mst_port = aconnector->mst_output_port;

	mst_mgr = &aconnector->mst_root->mst_mgr;



	if (!crtc_state->connectors_changed && !crtc_state->mode_changed)

		return 0;
@@ -6642,7 +6642,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, 
		return PTR_ERR(mst_state);



	if (!mst_state->pbn_div)

		mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_port->dc_link);

		mst_state->pbn_div = dm_mst_get_pbn_divider(aconnector->mst_root->dc_link);



	if (!state->duplicated) {

		int max_bpc = conn_state->max_requested_bpc;
@@ -6688,7 +6688,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, 


		aconnector = to_amdgpu_dm_connector(connector);



		if (!aconnector->port)

		if (!aconnector->mst_output_port)

			continue;



		if (!new_con_state || !new_con_state->crtc)
@@ -6728,7 +6728,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, 
			dm_conn_state->pbn = pbn;

			dm_conn_state->vcpi_slots = slot_num;



			ret = drm_dp_mst_atomic_enable_dsc(state, aconnector->port,

			ret = drm_dp_mst_atomic_enable_dsc(state, aconnector->mst_output_port,

							   dm_conn_state->pbn, false);

			if (ret < 0)

				return ret;
@@ -6736,7 +6736,7 @@ static int dm_update_mst_vcpi_slots_for_dsc(struct drm_atomic_state *state, 
			continue;

		}



		vcpi = drm_dp_mst_atomic_enable_dsc(state, aconnector->port, pbn, true);

		vcpi = drm_dp_mst_atomic_enable_dsc(state, aconnector->mst_output_port, pbn, true);

		if (vcpi < 0)

			return vcpi;
@@ -7150,7 +7150,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, 
				adev->mode_info.underscan_vborder_property,

				0);



	if (!aconnector->mst_port)

	if (!aconnector->mst_root)

		drm_connector_attach_max_bpc_property(&aconnector->base, 8, 16);



	/* This defaults to the max in the range, but we want 8bpc for non-edp. */
@@ -7168,7 +7168,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, 
	    connector_type == DRM_MODE_CONNECTOR_eDP) {

		drm_connector_attach_hdr_output_metadata_property(&aconnector->base);



		if (!aconnector->mst_port)

		if (!aconnector->mst_root)

			drm_connector_attach_vrr_capable_property(&aconnector->base);



#ifdef CONFIG_DRM_AMD_DC_HDCP
@@ -9635,7 +9635,7 @@ static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm 
			continue;



		aconnector = to_amdgpu_dm_connector(connector);

		if (!aconnector->port || !aconnector->mst_port)

		if (!aconnector->mst_output_port || !aconnector->mst_root)

			aconnector = NULL;

		else

			break;
@@ -9644,7 +9644,7 @@ static int add_affected_mst_dsc_crtcs(struct drm_atomic_state *state, struct drm 
	if (!aconnector)

		return 0;



	return drm_dp_mst_add_affected_dsc_crtcs(state, &aconnector->mst_port->mst_mgr);

	return drm_dp_mst_add_affected_dsc_crtcs(state, &aconnector->mst_root->mst_mgr);

}

#endif

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+2 −2
Original line number Diff line number Diff line
@@ -605,8 +605,8 @@ struct amdgpu_dm_connector { 
	/* DM only */

	struct drm_dp_mst_topology_mgr mst_mgr;

	struct amdgpu_dm_dp_aux dm_dp_aux;

	struct drm_dp_mst_port *port;

	struct amdgpu_dm_connector *mst_port;

	struct drm_dp_mst_port *mst_output_port;

	struct amdgpu_dm_connector *mst_root;

	struct drm_dp_aux *dsc_aux;

	/* TODO see if we can merge with ddc_bus or make a dm_connector */

	struct amdgpu_i2c_adapter *i2c;

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

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int amdgpu_dm_crtc_set_crc_source(struct drm_crtc *crtc, const char *src_name) 
			goto cleanup;

		}



		aux = (aconn->port) ? &aconn->port->aux : &aconn->dm_dp_aux.aux;

		aux = (aconn->mst_output_port) ? &aconn->mst_output_port->aux : &aconn->dm_dp_aux.aux;



		if (!aux) {

			DRM_DEBUG_DRIVER("No dp aux for amd connector\n");

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

+8 −8
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static int dp_dsc_fec_support_show(struct seq_file *m, void *data) 
			break;

		}

		dpcd_caps = aconnector->dc_link->dpcd_caps;

		if (aconnector->port) {

		if (aconnector->mst_output_port) {

			/* aconnector sets dsc_aux during get_modes call

			 * if MST connector has it means it can either

			 * enable DSC on the sink device or on MST branch
@@ -1280,7 +1280,7 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, 
	mutex_lock(&aconnector->hpd_lock);



	/* Don't support for mst end device*/

	if (aconnector->mst_port) {

	if (aconnector->mst_root) {

		mutex_unlock(&aconnector->hpd_lock);

		return -EINVAL;

	}
@@ -2539,13 +2539,13 @@ static int dp_is_mst_connector_show(struct seq_file *m, void *unused) 


	if (aconnector->mst_mgr.mst_state) {

		role = "root";

	} else if (aconnector->mst_port &&

		aconnector->mst_port->mst_mgr.mst_state) {

	} else if (aconnector->mst_root &&

		aconnector->mst_root->mst_mgr.mst_state) {



		role = "end";



		mgr = &aconnector->mst_port->mst_mgr;

		port = aconnector->port;

		mgr = &aconnector->mst_root->mst_mgr;

		port = aconnector->mst_output_port;



		drm_modeset_lock(&mgr->base.lock, NULL);

		if (port->pdt == DP_PEER_DEVICE_MST_BRANCHING &&
@@ -3392,12 +3392,12 @@ static int trigger_hpd_mst_set(void *data, u64 val) 
			if (!aconnector->dc_link)

				continue;



			if (!aconnector->mst_port)

			if (!aconnector->mst_root)

				continue;



			link = aconnector->dc_link;

			dc_link_dp_receiver_power_ctrl(link, false);

			drm_dp_mst_topology_mgr_set_mst(&aconnector->mst_port->mst_mgr, false);

			drm_dp_mst_topology_mgr_set_mst(&aconnector->mst_root->mst_mgr, false);

			link->mst_stream_alloc_table.stream_count = 0;

			memset(link->mst_stream_alloc_table.stream_allocations, 0,

					sizeof(link->mst_stream_alloc_table.stream_allocations));