Skip to contentSkip to conversation

Refactor and clean up codes of mst

PATCH Superseded Wayne Lin 4 participants 14 messages Aug 7, 2023 – Sep 13, 2023

Subsystems (7)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Wayne Lin

author
#0 lore raw

v2 cover Refactor and clean up codes of mst

This patch set is mainly trying to organize the mst code today a bit. Like to clarify and organize the sequence of mst payload allocation and removement.And also clean up some redundant codes today.

The main refactor one is the patch
"drm/mst: Refactor the flow for payload allocation/removement" which is adding a new enum variable in stuct drm_dp_mst_atomic_payload to represent the status of paylad alloction, and then handle the payload accordingly. Besides, rename some drm mst functions to better express the behind idea.

The other two patches are mainly to clean up unnecessary codes.

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

Wayne Lin (3):
drm/mst: delete unnecessary case in drm_dp_add_payload_part2() drm/mst: Refactor the flow for payload allocation/removement drm/mst: adjust the function drm_dp_remove_payload_part2()

 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  60 +-----
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 189 +++++++++++-------
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  13 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  17 +-
 include/drm/display/drm_dp_mst_helper.h       |  22 +-
 5 files changed, 159 insertions(+), 142 deletions(-)
Signature · 1 line
2.37.3
author
#1 lore raw

PATCH v2 1/3 drm/mst: delete unnecessary case in drm_dp_add_payload_part2()

[Why]
There is no need to consider payload->delete case since we won't call drm_dp_add_payload_part2() to create a payload when we're about to remove it.

[How]
Delete unnecessary case to simplify the code.

---
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -6
index ed96cfcfa304..4d80426757ab 100644
@@ -3411,12 +3411,8 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 
 	ret = drm_dp_create_payload_step2(mgr, payload);
 	if (ret < 0) {
-		if (!payload->delete)
-			drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n",
-				payload->port, ret);
-		else
-			drm_dbg_kms(mgr->dev, "Step 2 of removing MST payload for %p failed: %d\n",
-				    payload->port, ret);
+		drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n",
+			payload->port, ret);
 	}
 
 	return ret;
Signature · 1 line
2.37.3
author
#2 lore raw

PATCH v2 2/3 drm/mst: Refactor the flow for payload allocation/removement

In reply to Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload removement.

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along the virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW programming.

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++-------
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +12 -8
index d9a482908380..9ad509279b0a 100644
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
 	/* Set correct time_slots/PBN of old payload.
 	 * other fields (delete & dsc_enabled) in
 	 * struct drm_dp_mst_atomic_payload are don't care fields
-	 * while calling drm_dp_remove_payload()
+	 * while calling drm_dp_remove_payload_part2()
 	 */
 	for (i = 0; i < current_link_table.stream_count; i++) {
 		dc_alloc =
@@ -262,13 +262,12 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
-
-	/* It's OK for this to fail */
 	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (enable) {
 		target_payload = new_payload;
 
+		/* It's OK for this to fail */
 		drm_dp_add_payload_part1(mst_mgr, mst_state, new_payload);
 	} else {
 		/* construct old payload by VCPI*/
@@ -276,7 +275,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 						new_payload, &old_payload);
 		target_payload = &old_payload;
 
-		drm_dp_remove_payload(mst_mgr, mst_state, &old_payload, new_payload);
+		drm_dp_remove_payload_part1(mst_mgr, mst_state, new_payload);
 	}
 
 	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
@@ -342,7 +341,7 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	struct amdgpu_dm_connector *aconnector;
 	struct drm_dp_mst_topology_state *mst_state;
 	struct drm_dp_mst_topology_mgr *mst_mgr;
-	struct drm_dp_mst_atomic_payload *payload;
+	struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
 	enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 	int ret = 0;
@@ -355,15 +354,20 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
+	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (!enable) {
 		set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 		clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	}
 
-	if (enable)
-		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload);
+	if (enable) {
+		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, new_payload);
+	} else {
+		dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
+						 new_payload, old_payload);
+		drm_dp_remove_payload_part2(mst_mgr, mst_state, old_payload, new_payload);
+	}
 
 	if (ret) {
 		amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +100 -59

284 lines not on this page · raw message

drivers/gpu/drm/i915/display/intel_dp_mst.c +12 -6
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
-	struct drm_dp_mst_topology_state *old_mst_state =
-		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
 	struct drm_dp_mst_topology_state *new_mst_state =
 		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
-	const struct drm_dp_mst_atomic_payload *old_payload =
-		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
 	struct drm_dp_mst_atomic_payload *new_payload =
 		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
@@ -572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 
 	intel_hdcp_disable(intel_mst->connector);
 
-	drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-			      old_payload, new_payload);
+	drm_dp_remove_payload_part1(&intel_dp->mst_mgr, new_mst_state, new_payload);
 
 	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }
@@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	struct drm_dp_mst_topology_state *new_mst_state =
+		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	bool last_mst_stream;
 
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
 	wait_for_act_sent(encoder, old_crtc_state);
 
+	drm_dp_remove_payload_part2(&intel_dp->mst_mgr, new_mst_state,
+				    old_payload, new_payload);
+
 	intel_ddi_disable_transcoder_func(old_crtc_state);
 
 	if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +11 -10
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-		  struct drm_dp_mst_topology_state *mst_state,
+		  struct drm_dp_mst_topology_state *new_mst_state,
 		  struct drm_dp_mst_topology_mgr *mgr,
 		  struct nv50_msto *msto)
 {
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-	struct drm_dp_mst_atomic_payload *payload =
-		drm_atomic_get_mst_payload_state(mst_state, msto->mstc->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, msto->mstc->port);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(state, mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, msto->mstc->port);
 
 	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
 	if (msto->disabled) {
 		msto->mstc = NULL;
 		msto->disabled = false;
+		drm_dp_remove_payload_part2(mgr, new_mst_state, old_payload, new_payload);
 	} else if (msto->enabled) {
-		drm_dp_add_payload_part2(mgr, state, payload);
+		drm_dp_add_payload_part2(mgr, state, new_payload);
 		msto->enabled = false;
 	}
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state *state,
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
 	struct nv50_mstc *mstc = msto->mstc;
 	struct nv50_mstm *mstm = mstc->mstm;
-	struct drm_dp_mst_topology_state *old_mst_state;
-	struct drm_dp_mst_atomic_payload *payload, *old_payload;
+	struct drm_dp_mst_atomic_payload *payload;
 
 	NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-	old_mst_state = drm_atomic_get_old_mst_topology_state(state, mgr);
-
 	payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port);
-	old_payload = drm_atomic_get_mst_payload_state(old_mst_state, mstc->port);
 
 	// TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
 	if (msto->disabled) {
-		drm_dp_remove_payload(mgr, mst_state, old_payload, payload);
+		drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
 		nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0);
 	} else {
include/drm/display/drm_dp_mst_helper.h +18 -5
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {
 };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+	DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
 	 *   drm_dp_mst_atomic_wait_for_dependencies() has been called, which will ensure the
 	 *   previous MST states payload start slots have been copied over to the new state. Note
 	 *   that a new start slot won't be assigned/removed from this payload until
-	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have been called.
+	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2() have been called.
 	 * * Acquire the MST modesetting lock, and then wait for any pending MST-related commits to
 	 *   get committed to hardware by calling drm_crtc_commit_wait() on each of the
 	 *   &drm_crtc_commit structs in &drm_dp_mst_topology_state.commit_deps.
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
 	/** @dsc_enabled: Whether or not this payload has DSC enabled */
 	bool dsc_enabled : 1;
 
+	/** @payload_allocation_status: The allocation status of this payload */
+	enum drm_dp_mst_payload_allocation payload_allocation_status;
+
 	/** @next: The list node for this payload */
 	struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
 int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_atomic_state *state,
 			     struct drm_dp_mst_atomic_payload *payload);
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-			   struct drm_dp_mst_topology_state *mst_state,
-			   const struct drm_dp_mst_atomic_payload *old_payload,
-			   struct drm_dp_mst_atomic_payload *new_payload);
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 struct drm_dp_mst_atomic_payload *payload);
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 const struct drm_dp_mst_atomic_payload *old_payload,
+				 struct drm_dp_mst_atomic_payload *new_payload);
 
 int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
 
Signature · 1 line
2.37.3
maintainer
#3 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Oooooo! This is a wonderful idea so far - keeping track of the status of allocations like this solves a lot of problems, especially with regards to the fact this actually seems to make it possible for us to have much better handling of payload failures in drivers - especially in situations like suspend/resume. The naming changes here are awesome too.

I think this patch is good as far as I can tell review-wise! I haven't been able to test it quite yet but I'll do it asap.

Quoted 35 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload removement.

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along the virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 7 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW programming.

yay!

Quoted 548 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++-------
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +12 -8
index d9a482908380..9ad509279b0a 100644
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
 	/* Set correct time_slots/PBN of old payload.
 	 * other fields (delete & dsc_enabled) in
 	 * struct drm_dp_mst_atomic_payload are don't care fields
-	 * while calling drm_dp_remove_payload()
+	 * while calling drm_dp_remove_payload_part2()
 	 */
 	for (i = 0; i < current_link_table.stream_count; i++) {
 		dc_alloc =
@@ -262,13 +262,12 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
-
-	/* It's OK for this to fail */
 	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (enable) {
 		target_payload = new_payload;
 
+		/* It's OK for this to fail */
 		drm_dp_add_payload_part1(mst_mgr, mst_state, new_payload);
 	} else {
 		/* construct old payload by VCPI*/
@@ -276,7 +275,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 						new_payload, &old_payload);
 		target_payload = &old_payload;
 
-		drm_dp_remove_payload(mst_mgr, mst_state, &old_payload, new_payload);
+		drm_dp_remove_payload_part1(mst_mgr, mst_state, new_payload);
 	}
 
 	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
@@ -342,7 +341,7 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	struct amdgpu_dm_connector *aconnector;
 	struct drm_dp_mst_topology_state *mst_state;
 	struct drm_dp_mst_topology_mgr *mst_mgr;
-	struct drm_dp_mst_atomic_payload *payload;
+	struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
 	enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 	int ret = 0;
@@ -355,15 +354,20 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
+	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (!enable) {
 		set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 		clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	}
 
-	if (enable)
-		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload);
+	if (enable) {
+		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, new_payload);
+	} else {
+		dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
+						 new_payload, old_payload);
+		drm_dp_remove_payload_part2(mst_mgr, mst_state, old_payload, new_payload);
+	}
 
 	if (ret) {
 		amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +100 -59
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
 }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
-				       struct drm_dp_mst_atomic_payload *payload)
+static int drm_dp_create_payload_at_dfp(struct drm_dp_mst_topology_mgr *mgr,
+					struct drm_dp_mst_atomic_payload *payload)
 {
 	return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot,
 					 payload->time_slots);
 }
 
-static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
-				       struct drm_dp_mst_atomic_payload *payload)
+static int drm_dp_create_payload_to_remote(struct drm_dp_mst_topology_mgr *mgr,
+					   struct drm_dp_mst_atomic_payload *payload)
 {
 	int ret;
 	struct drm_dp_mst_port *port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
@@ -3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
 	return ret;
 }
 
-static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
-					struct drm_dp_mst_topology_state *mst_state,
-					struct drm_dp_mst_atomic_payload *payload)
+static void drm_dp_destroy_payload_at_remote_and_dfp(struct drm_dp_mst_topology_mgr *mgr,
+						     struct drm_dp_mst_topology_state *mst_state,
+						     struct drm_dp_mst_atomic_payload *payload)
 {
 	drm_dbg_kms(mgr->dev, "\n");
 
 	/* it's okay for these to fail */
-	drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-	drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0);
+	if (payload->payload_allocation_status == DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {
+		drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;
+	}
 
-	return 0;
+	if (payload->payload_allocation_status == DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)
+		drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and payload packets.
+ * into the DPCD of DPRX. After calling this, the driver should generate ACT and payload packets.
  *
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
  */
 int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_dp_mst_topology_state *mst_state,
 			     struct drm_dp_mst_atomic_payload *payload)
 {
 	struct drm_dp_mst_port *port;
-	int ret;
+	int ret = 0;
+	bool allocate = true;
+
+	/* Update mst mgr info */
+	if (mgr->payload_count == 0)
+		mgr->next_start_slot = mst_state->start_slot;
+
+	payload->vc_start_slot = mgr->next_start_slot;
+
+	mgr->payload_count++;
+	mgr->next_start_slot += payload->time_slots;
 
+	/* Allocate payload to immediate downstream facing port */
 	port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
 	if (!port) {
 		drm_dbg_kms(mgr->dev,
-			    "VCPI %d for port %p not in topology, not creating a payload\n",
+			    "VCPI %d for port %p not in topology, not creating a payload to remote\n",
 			    payload->vcpi, payload->port);
-		payload->vc_start_slot = -1;
-		return 0;
+		allocate = false;
 	}
 
-	if (mgr->payload_count == 0)
-		mgr->next_start_slot = mst_state->start_slot;
-
-	payload->vc_start_slot = mgr->next_start_slot;
+	if (allocate) {
+		ret = drm_dp_create_payload_at_dfp(mgr, payload);
+		if (ret < 0)
+			drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n",
+				 payload->port, ret);
 
-	ret = drm_dp_create_payload_step1(mgr, payload);
-	drm_dp_mst_topology_put_port(port);
-	if (ret < 0) {
-		drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n",
-			 payload->port, ret);
-		payload->vc_start_slot = -1;
-		return ret;
 	}
 
-	mgr->payload_count++;
-	mgr->next_start_slot += payload->time_slots;
+	payload->payload_allocation_status =
+		(!allocate || ret < 0) ? DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :
+								DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;
 
-	return 0;
+	drm_dp_mst_topology_put_port(port);
+
+	return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT and payload packets.
+ * Removes a payload along the virtual channel if it was successfully allocated.
+ * After calling this, the driver should set HW to generate ACT and then switch to new
+ * payload allocation state.
  */
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-			   struct drm_dp_mst_topology_state *mst_state,
-			   const struct drm_dp_mst_atomic_payload *old_payload,
-			   struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 struct drm_dp_mst_atomic_payload *payload)
 {
-	struct drm_dp_mst_atomic_payload *pos;
+	/* Remove remote payload allocation */
 	bool send_remove = false;
 
-	/* We failed to make the payload, so nothing to do */
-	if (new_payload->vc_start_slot == -1)
-		return;
-
 	mutex_lock(&mgr->lock);
-	send_remove = drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr->mst_primary);
+	send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary);
 	mutex_unlock(&mgr->lock);
 
 	if (send_remove)
-		drm_dp_destroy_payload_step1(mgr, mst_state, new_payload);
+		drm_dp_destroy_payload_at_remote_and_dfp(mgr, mst_state, payload);
 	else
 		drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n",
-			    new_payload->vcpi);
+			    payload->vcpi);
+
+	payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
 
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
+ *
+ * Updates the starting time slots of all other payloads which would have been shifted towards
+ * the start of the payload ID table as a result of removing a payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 const struct drm_dp_mst_atomic_payload *old_payload,
+				 struct drm_dp_mst_atomic_payload *new_payload)
+{
+	struct drm_dp_mst_atomic_payload *pos;
+
+	/* Remove local payload allocation */
 	list_for_each_entry(pos, &mst_state->payloads, next) {
 		if (pos != new_payload && pos->vc_start_slot > new_payload->vc_start_slot)
 			pos->vc_start_slot -= old_payload->time_slots;
@@ -3382,9 +3409,10 @@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
 
 	if (new_payload->delete)
 		drm_dp_mst_put_port_malloc(new_payload->port);
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+	new_payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 	int ret = 0;
 
 	/* Skip failed payloads */
-	if (payload->vc_start_slot == -1) {
-		drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
+	if (payload->payload_allocation_status != DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {
+		drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
 			    payload->port->connector->name);
 		return -EIO;
 	}
 
-	ret = drm_dp_create_payload_step2(mgr, payload);
-	if (ret < 0) {
+	/* Allocate payload to remote end */
+	ret = drm_dp_create_payload_to_remote(mgr, payload);
+	if (ret < 0)
 		drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n",
 			payload->port, ret);
-	}
+	else
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
 	return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
 		drm_dp_mst_get_port_malloc(port);
 		payload->port = port;
 		payload->vc_start_slot = -1;
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
 		list_add(&payload->next, &topology_state->payloads);
 	}
 	payload->time_slots = req_slots;
@@ -4493,7 +4524,7 @@ void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
 		}
 
 		/* Now that previous state is committed, it's safe to copy over the start slot
-		 * assignments
+		 * and allocation status assignments
 		 */
 		list_for_each_entry(old_payload, &old_mst_state->payloads, next) {
 			if (old_payload->delete)
@@ -4502,6 +4533,8 @@ void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
 			new_payload = drm_atomic_get_mst_payload_state(new_mst_state,
 								       old_payload->port);
 			new_payload->vc_start_slot = old_payload->vc_start_slot;
+			new_payload->payload_allocation_status =
+							old_payload->payload_allocation_status;
 		}
 	}
 }
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 	struct drm_dp_mst_atomic_payload *payload;
 	int i, ret;
 
+	static const char *const status[] = {
+		"None",
+		"Local",
+		"DFP",
+		"Remote",
+	};
+
 	mutex_lock(&mgr->lock);
 	if (mgr->mst_primary)
 		drm_dp_mst_dump_mstb(m, mgr->mst_primary);
@@ -4834,7 +4874,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 	seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u, pbn_div: %d\n",
 		   state->payload_mask, mgr->max_payloads, state->start_slot, state->pbn_div);
 
-	seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc |     sink name     |\n");
+	seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status |     sink name     |\n");
 	for (i = 0; i < mgr->max_payloads; i++) {
 		list_for_each_entry(payload, &state->payloads, next) {
 			char name[14];
@@ -4843,7 +4883,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 				continue;
 
 			fetch_monitor_name(mgr, payload->port, name, sizeof(name));
-			seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %19s\n",
+			seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %8s %19s\n",
 				   i,
 				   payload->port->port_num,
 				   payload->vcpi,
@@ -4851,6 +4891,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 				   payload->vc_start_slot + payload->time_slots - 1,
 				   payload->pbn,
 				   payload->dsc_enabled ? "Y" : "N",
+				   status[payload->payload_allocation_status],
 				   (*name != 0) ? name : "Unknown");
 		}
 	}
drivers/gpu/drm/i915/display/intel_dp_mst.c +12 -6
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
-	struct drm_dp_mst_topology_state *old_mst_state =
-		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
 	struct drm_dp_mst_topology_state *new_mst_state =
 		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
-	const struct drm_dp_mst_atomic_payload *old_payload =
-		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
 	struct drm_dp_mst_atomic_payload *new_payload =
 		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
@@ -572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 
 	intel_hdcp_disable(intel_mst->connector);
 
-	drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-			      old_payload, new_payload);
+	drm_dp_remove_payload_part1(&intel_dp->mst_mgr, new_mst_state, new_payload);
 
 	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }
@@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	struct drm_dp_mst_topology_state *new_mst_state =
+		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	bool last_mst_stream;
 
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
 	wait_for_act_sent(encoder, old_crtc_state);
 
+	drm_dp_remove_payload_part2(&intel_dp->mst_mgr, new_mst_state,
+				    old_payload, new_payload);
+
 	intel_ddi_disable_transcoder_func(old_crtc_state);
 
 	if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +11 -10
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-		  struct drm_dp_mst_topology_state *mst_state,
+		  struct drm_dp_mst_topology_state *new_mst_state,
 		  struct drm_dp_mst_topology_mgr *mgr,
 		  struct nv50_msto *msto)
 {
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-	struct drm_dp_mst_atomic_payload *payload =
-		drm_atomic_get_mst_payload_state(mst_state, msto->mstc->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, msto->mstc->port);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(state, mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, msto->mstc->port);
 
 	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
 	if (msto->disabled) {
 		msto->mstc = NULL;
 		msto->disabled = false;
+		drm_dp_remove_payload_part2(mgr, new_mst_state, old_payload, new_payload);
 	} else if (msto->enabled) {
-		drm_dp_add_payload_part2(mgr, state, payload);
+		drm_dp_add_payload_part2(mgr, state, new_payload);
 		msto->enabled = false;
 	}
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state *state,
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
 	struct nv50_mstc *mstc = msto->mstc;
 	struct nv50_mstm *mstm = mstc->mstm;
-	struct drm_dp_mst_topology_state *old_mst_state;
-	struct drm_dp_mst_atomic_payload *payload, *old_payload;
+	struct drm_dp_mst_atomic_payload *payload;
 
 	NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-	old_mst_state = drm_atomic_get_old_mst_topology_state(state, mgr);
-
 	payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port);
-	old_payload = drm_atomic_get_mst_payload_state(old_mst_state, mstc->port);
 
 	// TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
 	if (msto->disabled) {
-		drm_dp_remove_payload(mgr, mst_state, old_payload, payload);
+		drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
 		nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0);
 	} else {
include/drm/display/drm_dp_mst_helper.h +18 -5
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {
 };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+	DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
 	 *   drm_dp_mst_atomic_wait_for_dependencies() has been called, which will ensure the
 	 *   previous MST states payload start slots have been copied over to the new state. Note
 	 *   that a new start slot won't be assigned/removed from this payload until
-	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have been called.
+	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2() have been called.
 	 * * Acquire the MST modesetting lock, and then wait for any pending MST-related commits to
 	 *   get committed to hardware by calling drm_crtc_commit_wait() on each of the
 	 *   &drm_crtc_commit structs in &drm_dp_mst_topology_state.commit_deps.
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
 	/** @dsc_enabled: Whether or not this payload has DSC enabled */
 	bool dsc_enabled : 1;
 
+	/** @payload_allocation_status: The allocation status of this payload */
+	enum drm_dp_mst_payload_allocation payload_allocation_status;
+
 	/** @next: The list node for this payload */
 	struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
 int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_atomic_state *state,
 			     struct drm_dp_mst_atomic_payload *payload);
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-			   struct drm_dp_mst_topology_state *mst_state,
-			   const struct drm_dp_mst_atomic_payload *old_payload,
-			   struct drm_dp_mst_atomic_payload *new_payload);
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 struct drm_dp_mst_atomic_payload *payload);
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 const struct drm_dp_mst_atomic_payload *old_payload,
+				 struct drm_dp_mst_atomic_payload *new_payload);
 
 int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
 
Signature · 3 lines
Cheers,
 Lyude Paul (she/her)
 Software Engineer at Red Hat
author
#4 lore raw

RE: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

[AMD Official Use Only - General]

Thanks for your time, Lyude!

Regards,
Wayne

Quoted 788 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Tuesday, August 8, 2023 4:23 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Oooooo! This is a wonderful idea so far - keeping track of the status of allocations like this solves a lot of problems, especially with regards to the fact this actually seems to make it possible for us to have much better handling of payload failures in drivers - especially in situations like suspend/resume. The naming changes here are awesome too.

I think this patch is good as far as I can tell review-wise! I haven't been able to test it quite yet but I'll do it asap.

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 11 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 12 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 7 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

yay!

Quoted 9 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++------

-

Quoted 6 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)

diff --git

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

Quoted 23 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

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

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -276,7 +275,7 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
                                            new_payload, &old_payload);
            target_payload = &old_payload;
 
-           drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 278

Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+           drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 281

Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
    }
 
    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

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

Quoted 2 lines
    int ret = 0;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -1
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -1
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link, mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3258

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                   struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
 vc_start_slot,
                                     payload->time_slots);
 }
 
-static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3266

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                      struct drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
 {
    int ret;

struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 1 line

+ * into the DPCD of DPRX. After calling this, the driver should generate ACT

and payload packets.

Quoted 28 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,

                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 1 line

+ "VCPI %d for port %p not in topology, not creating a

payload

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -4
    }
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;
Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along the
+ virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 4 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 1 line

+ * Removes a payload along the virtual channel if it was successfully

allocated.

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT and
+ then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
 
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +10 -0
+ *
+ * Updates the starting time slots of all other payloads which would
+have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's independent
+to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot > new_payload-

vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots; @@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3435

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation for %s

failed,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for %p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
                    payload->port, ret);
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots;
@@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4526

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
            }
 
            /* Now that previous state is committed, it's safe to copy over

the start slot

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload, &old_mst_state->payloads,

next) {

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    if (old_payload->delete)
@@ -4502,6 +4533,8 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4533

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 9 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-
payload_allocation_status;
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 2 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u,

pbn_div: %d\n",

Quoted 5 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name

|\n");

Quoted 1 line

+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14];
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4843,7 +4883,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                            continue;
 
                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4846

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4886

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%8s %19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                               i,
                               payload->port->port_num,
                               payload->vcpi,
@@ -4851,6 +4891,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
                               payload->vc_start_slot + payload-
 time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
+                              status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -1
    struct drm_i915_private *i915 = to_i915(connector->base.dev); @@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

    intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
} @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct
intel_atomic_state *state,
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 29 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct
 drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)
 {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder *nv50_real_outp(struct · line 906

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 924

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling VCPI

allocation failures here?

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 925

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -1
    if (msto->disabled) {
-           drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 24 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -0
+           drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
 base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +7 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 548

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any pending

MST-related commits to

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 549

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   get committed to hardware by calling drm_crtc_commit_wait() on

each of the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 550

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 574

Quoted 5 lines
include/drm/display/drm_dp_mst_helper.h +1 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this payload

*/

Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload *payload); -

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

include/drm/display/drm_dp_mst_helper.h

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+                            struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 3 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

maintainer Reviewed-by on v2 2/3
#5 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

In reply to Wayne Lin

Two small comments:

Quoted 232 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload removement.

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along the virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW programming.

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++-------
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +12 -8
index d9a482908380..9ad509279b0a 100644
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
 	/* Set correct time_slots/PBN of old payload.
 	 * other fields (delete & dsc_enabled) in
 	 * struct drm_dp_mst_atomic_payload are don't care fields
-	 * while calling drm_dp_remove_payload()
+	 * while calling drm_dp_remove_payload_part2()
 	 */
 	for (i = 0; i < current_link_table.stream_count; i++) {
 		dc_alloc =
@@ -262,13 +262,12 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
-
-	/* It's OK for this to fail */
 	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (enable) {
 		target_payload = new_payload;
 
+		/* It's OK for this to fail */
 		drm_dp_add_payload_part1(mst_mgr, mst_state, new_payload);
 	} else {
 		/* construct old payload by VCPI*/
@@ -276,7 +275,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 						new_payload, &old_payload);
 		target_payload = &old_payload;
 
-		drm_dp_remove_payload(mst_mgr, mst_state, &old_payload, new_payload);
+		drm_dp_remove_payload_part1(mst_mgr, mst_state, new_payload);
 	}
 
 	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
@@ -342,7 +341,7 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	struct amdgpu_dm_connector *aconnector;
 	struct drm_dp_mst_topology_state *mst_state;
 	struct drm_dp_mst_topology_mgr *mst_mgr;
-	struct drm_dp_mst_atomic_payload *payload;
+	struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
 	enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 	int ret = 0;
@@ -355,15 +354,20 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
+	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (!enable) {
 		set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 		clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	}
 
-	if (enable)
-		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload);
+	if (enable) {
+		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, new_payload);
+	} else {
+		dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
+						 new_payload, old_payload);
+		drm_dp_remove_payload_part2(mst_mgr, mst_state, old_payload, new_payload);
+	}
 
 	if (ret) {
 		amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +34 -25
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
 }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
-				       struct drm_dp_mst_atomic_payload *payload)
+static int drm_dp_create_payload_at_dfp(struct drm_dp_mst_topology_mgr *mgr,
+					struct drm_dp_mst_atomic_payload *payload)
 {
 	return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot,
 					 payload->time_slots);
 }
 
-static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
-				       struct drm_dp_mst_atomic_payload *payload)
+static int drm_dp_create_payload_to_remote(struct drm_dp_mst_topology_mgr *mgr,
+					   struct drm_dp_mst_atomic_payload *payload)
 {
 	int ret;
 	struct drm_dp_mst_port *port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
@@ -3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,
 	return ret;
 }
 
-static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
-					struct drm_dp_mst_topology_state *mst_state,
-					struct drm_dp_mst_atomic_payload *payload)
+static void drm_dp_destroy_payload_at_remote_and_dfp(struct drm_dp_mst_topology_mgr *mgr,
+						     struct drm_dp_mst_topology_state *mst_state,
+						     struct drm_dp_mst_atomic_payload *payload)
 {
 	drm_dbg_kms(mgr->dev, "\n");
 
 	/* it's okay for these to fail */
-	drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-	drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0);
+	if (payload->payload_allocation_status == DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {
+		drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;
+	}
 
-	return 0;
+	if (payload->payload_allocation_status == DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)
+		drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and payload packets.
+ * into the DPCD of DPRX. After calling this, the driver should generate ACT and payload packets.
  *
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
  */
 int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_dp_mst_topology_state *mst_state,
 			     struct drm_dp_mst_atomic_payload *payload)
 {
 	struct drm_dp_mst_port *port;
-	int ret;
+	int ret = 0;
+	bool allocate = true;
+
+	/* Update mst mgr info */
+	if (mgr->payload_count == 0)
+		mgr->next_start_slot = mst_state->start_slot;
+
+	payload->vc_start_slot = mgr->next_start_slot;
+
+	mgr->payload_count++;
+	mgr->next_start_slot += payload->time_slots;
 
+	/* Allocate payload to immediate downstream facing port */
 	port = drm_dp_mst_topology_get_port_validated(mgr, payload->port);
 	if (!port) {
 		drm_dbg_kms(mgr->dev,
-			    "VCPI %d for port %p not in topology, not creating a payload\n",
+			    "VCPI %d for port %p not in topology, not creating a payload to remote\n",
 			    payload->vcpi, payload->port);
-		payload->vc_start_slot = -1;
-		return 0;
+		allocate = false;
 	}
 
-	if (mgr->payload_count == 0)
-		mgr->next_start_slot = mst_state->start_slot;
-
-	payload->vc_start_slot = mgr->next_start_slot;
+	if (allocate) {
+		ret = drm_dp_create_payload_at_dfp(mgr, payload);
+		if (ret < 0)
+			drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n",
+				 payload->port, ret);
 
-	ret = drm_dp_create_payload_step1(mgr, payload);
-	drm_dp_mst_topology_put_port(port);
-	if (ret < 0) {
-		drm_warn(mgr->dev, "Failed to create MST payload for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr, · line 3342

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -5
-			 payload->port, ret);
-		payload->vc_start_slot = -1;
-		return ret;
 	}
 
-	mgr->payload_count++;
-	mgr->next_start_slot += payload->time_slots;
+	payload->payload_allocation_status =
+		(!allocate || ret < 0) ? DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :
+								DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 136 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +51 -27
-	return 0;
+	drm_dp_mst_topology_put_port(port);
+
+	return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT and payload packets.
+ * Removes a payload along the virtual channel if it was successfully allocated.
+ * After calling this, the driver should set HW to generate ACT and then switch to new
+ * payload allocation state.
  */
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-			   struct drm_dp_mst_topology_state *mst_state,
-			   const struct drm_dp_mst_atomic_payload *old_payload,
-			   struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 struct drm_dp_mst_atomic_payload *payload)
 {
-	struct drm_dp_mst_atomic_payload *pos;
+	/* Remove remote payload allocation */
 	bool send_remove = false;
 
-	/* We failed to make the payload, so nothing to do */
-	if (new_payload->vc_start_slot == -1)
-		return;
-
 	mutex_lock(&mgr->lock);
-	send_remove = drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr->mst_primary);
+	send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary);
 	mutex_unlock(&mgr->lock);
 
 	if (send_remove)
-		drm_dp_destroy_payload_step1(mgr, mst_state, new_payload);
+		drm_dp_destroy_payload_at_remote_and_dfp(mgr, mst_state, payload);
 	else
 		drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n",
-			    new_payload->vcpi);
+			    payload->vcpi);
+
+	payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
 
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
+ *
+ * Updates the starting time slots of all other payloads which would have been shifted towards
+ * the start of the payload ID table as a result of removing a payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 const struct drm_dp_mst_atomic_payload *old_payload,
+				 struct drm_dp_mst_atomic_payload *new_payload)
+{
+	struct drm_dp_mst_atomic_payload *pos;
+
+	/* Remove local payload allocation */
 	list_for_each_entry(pos, &mst_state->payloads, next) {
 		if (pos != new_payload && pos->vc_start_slot > new_payload->vc_start_slot)
 			pos->vc_start_slot -= old_payload->time_slots;
@@ -3382,9 +3409,10 @@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
 
 	if (new_payload->delete)
 		drm_dp_mst_put_port_malloc(new_payload->port);
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+	new_payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 	int ret = 0;
 
 	/* Skip failed payloads */
-	if (payload->vc_start_slot == -1) {
-		drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
+	if (payload->payload_allocation_status != DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {
+		drm_dbg_kms(state->dev, "Part 1 of payload creation for %s failed, skipping part 2\n",
 			    payload->port->connector->name);
 		return -EIO;
 	}
 
-	ret = drm_dp_create_payload_step2(mgr, payload);
-	if (ret < 0) {
+	/* Allocate payload to remote end */
+	ret = drm_dp_create_payload_to_remote(mgr, payload);
+	if (ret < 0)
 		drm_err(mgr->dev, "Step 2 of creating MST payload for %p failed: %d\n",
 			payload->port, ret);
-	}
+	else
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
 	return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
 		drm_dp_mst_get_port_malloc(port);
 		payload->port = port;
 		payload->vc_start_slot = -1;
+		payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
 		list_add(&payload->next, &topology_state->payloads);
 	}
 	payload->time_slots = req_slots;
@@ -4493,7 +4524,7 @@ void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
 		}
 
 		/* Now that previous state is committed, it's safe to copy over the start slot
-		 * assignments
+		 * and allocation status assignments
 		 */
 		list_for_each_entry(old_payload, &old_mst_state->payloads, next) {
 			if (old_payload->delete)

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state) · line 4537

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
@@ -4502,6 +4533,8 @@ void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)
 			new_payload = drm_atomic_get_mst_payload_state(new_mst_state,
 								       old_payload->port);
 			new_payload->vc_start_slot = old_payload->vc_start_slot;
+			new_payload->payload_allocation_status =
+							old_payload->payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

Quoted 207 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +10 -2
 		}
 	}
 }
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 	struct drm_dp_mst_atomic_payload *payload;
 	int i, ret;
 
+	static const char *const status[] = {
+		"None",
+		"Local",
+		"DFP",
+		"Remote",
+	};
+
 	mutex_lock(&mgr->lock);
 	if (mgr->mst_primary)
 		drm_dp_mst_dump_mstb(m, mgr->mst_primary);
@@ -4834,7 +4874,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 	seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u, pbn_div: %d\n",
 		   state->payload_mask, mgr->max_payloads, state->start_slot, state->pbn_div);
 
-	seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc |     sink name     |\n");
+	seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status |     sink name     |\n");
 	for (i = 0; i < mgr->max_payloads; i++) {
 		list_for_each_entry(payload, &state->payloads, next) {
 			char name[14];
@@ -4843,7 +4883,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 				continue;
 
 			fetch_monitor_name(mgr, payload->port, name, sizeof(name));
-			seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %19s\n",
+			seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s %8s %19s\n",
 				   i,
 				   payload->port->port_num,
 				   payload->vcpi,
@@ -4851,6 +4891,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m,
 				   payload->vc_start_slot + payload->time_slots - 1,
 				   payload->pbn,
 				   payload->dsc_enabled ? "Y" : "N",
+				   status[payload->payload_allocation_status],
 				   (*name != 0) ? name : "Unknown");
 		}
 	}
drivers/gpu/drm/i915/display/intel_dp_mst.c +12 -6
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
-	struct drm_dp_mst_topology_state *old_mst_state =
-		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
 	struct drm_dp_mst_topology_state *new_mst_state =
 		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
-	const struct drm_dp_mst_atomic_payload *old_payload =
-		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
 	struct drm_dp_mst_atomic_payload *new_payload =
 		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *i915 = to_i915(connector->base.dev);
@@ -572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
 
 	intel_hdcp_disable(intel_mst->connector);
 
-	drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-			      old_payload, new_payload);
+	drm_dp_remove_payload_part1(&intel_dp->mst_mgr, new_mst_state, new_payload);
 
 	intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }
@@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	struct drm_dp_mst_topology_state *new_mst_state =
+		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 	bool last_mst_stream;
 
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
 	wait_for_act_sent(encoder, old_crtc_state);
 
+	drm_dp_remove_payload_part2(&intel_dp->mst_mgr, new_mst_state,
+				    old_payload, new_payload);
+
 	intel_ddi_disable_transcoder_func(old_crtc_state);
 
 	if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +11 -10
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-		  struct drm_dp_mst_topology_state *mst_state,
+		  struct drm_dp_mst_topology_state *new_mst_state,
 		  struct drm_dp_mst_topology_mgr *mgr,
 		  struct nv50_msto *msto)
 {
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-	struct drm_dp_mst_atomic_payload *payload =
-		drm_atomic_get_mst_payload_state(mst_state, msto->mstc->port);
+	struct drm_dp_mst_atomic_payload *new_payload =
+		drm_atomic_get_mst_payload_state(new_mst_state, msto->mstc->port);
+	struct drm_dp_mst_topology_state *old_mst_state =
+		drm_atomic_get_old_mst_topology_state(state, mgr);
+	const struct drm_dp_mst_atomic_payload *old_payload =
+		drm_atomic_get_mst_payload_state(old_mst_state, msto->mstc->port);
 
 	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
 	if (msto->disabled) {
 		msto->mstc = NULL;
 		msto->disabled = false;
+		drm_dp_remove_payload_part2(mgr, new_mst_state, old_payload, new_payload);
 	} else if (msto->enabled) {
-		drm_dp_add_payload_part2(mgr, state, payload);
+		drm_dp_add_payload_part2(mgr, state, new_payload);
 		msto->enabled = false;
 	}
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state *state,
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
 	struct nv50_mstc *mstc = msto->mstc;
 	struct nv50_mstm *mstm = mstc->mstm;
-	struct drm_dp_mst_topology_state *old_mst_state;
-	struct drm_dp_mst_atomic_payload *payload, *old_payload;
+	struct drm_dp_mst_atomic_payload *payload;
 
 	NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-	old_mst_state = drm_atomic_get_old_mst_topology_state(state, mgr);
-
 	payload = drm_atomic_get_mst_payload_state(mst_state, mstc->port);
-	old_payload = drm_atomic_get_mst_payload_state(old_mst_state, mstc->port);
 
 	// TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
 	if (msto->disabled) {
-		drm_dp_remove_payload(mgr, mst_state, old_payload, payload);
+		drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
 		nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0);
 	} else {
include/drm/display/drm_dp_mst_helper.h +18 -5
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {
 };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+	DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+	DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
 	 *   drm_dp_mst_atomic_wait_for_dependencies() has been called, which will ensure the
 	 *   previous MST states payload start slots have been copied over to the new state. Note
 	 *   that a new start slot won't be assigned/removed from this payload until
-	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have been called.
+	 *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2() have been called.
 	 * * Acquire the MST modesetting lock, and then wait for any pending MST-related commits to
 	 *   get committed to hardware by calling drm_crtc_commit_wait() on each of the
 	 *   &drm_crtc_commit structs in &drm_dp_mst_topology_state.commit_deps.
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
 	/** @dsc_enabled: Whether or not this payload has DSC enabled */
 	bool dsc_enabled : 1;
 
+	/** @payload_allocation_status: The allocation status of this payload */
+	enum drm_dp_mst_payload_allocation payload_allocation_status;
+
 	/** @next: The list node for this payload */
 	struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
 int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_atomic_state *state,
 			     struct drm_dp_mst_atomic_payload *payload);
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-			   struct drm_dp_mst_topology_state *mst_state,
-			   const struct drm_dp_mst_atomic_payload *old_payload,
-			   struct drm_dp_mst_atomic_payload *new_payload);
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 struct drm_dp_mst_atomic_payload *payload);
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+				 struct drm_dp_mst_topology_state *mst_state,
+				 const struct drm_dp_mst_atomic_payload *old_payload,
+				 struct drm_dp_mst_atomic_payload *new_payload);
 
 int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
 
Signature · 3 lines
Cheers,
 Lyude Paul (she/her)
 Software Engineer at Red Hat
author
#6 lore raw

RE: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 783 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 11 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 12 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 7 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 9 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++------

-

Quoted 6 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)

diff --git

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

Quoted 23 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

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

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -276,7 +275,7 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
                                            new_payload, &old_payload);
            target_payload = &old_payload;
 
-           drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 278

Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+           drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 281

Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
    }
 
    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

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

Quoted 2 lines
    int ret = 0;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -1
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -1
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link, mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3258

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                   struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
 vc_start_slot,
                                     payload->time_slots);
 }
 
-static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3266

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                      struct drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
 {
    int ret;

struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 1 line

+ * into the DPCD of DPRX. After calling this, the driver should generate ACT

and payload packets.

Quoted 28 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,

                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 1 line

+ "VCPI %d for port %p not in topology, not creating a

payload

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -4
    }
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along the
+ virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 4 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 1 line

+ * Removes a payload along the virtual channel if it was successfully

allocated.

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT and
+ then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
 
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +10 -0
+ *
+ * Updates the starting time slots of all other payloads which would
+have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's independent
+to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot > new_payload-

vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots; @@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3435

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation for %s

failed,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for %p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
                    payload->port, ret);
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots;
@@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4526

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
            }
 
            /* Now that previous state is committed, it's safe to copy over

the start slot

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload, &old_mst_state->payloads,

next) {

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    if (old_payload->delete)
@@ -4502,6 +4533,8 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4533

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 5 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 2 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u,

pbn_div: %d\n",

Quoted 5 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name

|\n");

Quoted 1 line

+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14];
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4843,7 +4883,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                            continue;
 
                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4846

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4886

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%8s %19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                               i,
                               payload->port->port_num,
                               payload->vcpi,
@@ -4851,6 +4891,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
                               payload->vc_start_slot + payload-
 time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
+                              status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -1
    struct drm_i915_private *i915 = to_i915(connector->base.dev); @@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

    intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
} @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct
intel_atomic_state *state,
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 29 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct
 drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)
 {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder *nv50_real_outp(struct · line 906

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 924

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling VCPI

allocation failures here?

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 925

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -1
    if (msto->disabled) {
-           drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 24 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -0
+           drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
 base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +7 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 548

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any pending

MST-related commits to

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 549

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   get committed to hardware by calling drm_crtc_commit_wait() on

each of the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 550

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 574

Quoted 5 lines
include/drm/display/drm_dp_mst_helper.h +1 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this payload

*/

Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload *payload); -

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

include/drm/display/drm_dp_mst_helper.h

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+                            struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

maintainer
#7 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 798 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 783 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 11 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 12 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release bandwidth along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 7 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 9 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot <[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159 +++++++++++------

-

Quoted 6 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)

diff --git

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

Quoted 23 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

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

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -276,7 +275,7 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
                                            new_payload, &old_payload);
            target_payload = &old_payload;
 
-           drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 278

Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+           drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool · line 281

Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
    }
 
    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

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

Quoted 2 lines
    int ret = 0;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -1
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +6 -1
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link, mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3258

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3259

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                   struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
 vc_start_slot,
                                     payload->time_slots);
 }
 
-static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                                  struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3266

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3267

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                                      struct drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
 {
    int ret;

struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 1 line

+ * into the DPCD of DPRX. After calling this, the driver should generate ACT

and payload packets.

Quoted 28 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr *mgr,

                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 1 line

+ "VCPI %d for port %p not in topology, not creating a

payload

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -4
    }
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along the
+ virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 4 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 1 line

+ * Removes a payload along the virtual channel if it was successfully

allocated.

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT and
+ then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
 
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +10 -0
+ *
+ * Updates the starting time slots of all other payloads which would
+have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's independent
+to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot > new_payload-

vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots; @@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3435

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation for %s

failed,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for %p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
                    payload->port, ret);
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots;
@@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4526

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
            }
 
            /* Now that previous state is committed, it's safe to copy over

the start slot

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload, &old_mst_state->payloads,

next) {

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    if (old_payload->delete)
@@ -4502,6 +4533,8 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4533

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                    new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 5 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 2 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot: %u,

pbn_div: %d\n",

Quoted 7 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name
\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14];
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4843,7 +4883,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 3 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                            continue;
 
                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4846

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
-                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct · line 4886

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+                   seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%8s %19s\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
                               i,
                               payload->port->port_num,
                               payload->vcpi,
@@ -4851,6 +4891,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 14 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
                               payload->vc_start_slot + payload-
 time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
+                              status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -1
    struct drm_i915_private *i915 = to_i915(connector->base.dev); @@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

    intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
} @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct
intel_atomic_state *state,
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 29 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9)
drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
index 4e7c9c353c51..bba01fa0780c 100644
@@ -882,21 +882,26 @@ struct nouveau_encoder *nv50_real_outp(struct
 drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)
 {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder *nv50_real_outp(struct · line 906

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 924

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling VCPI

allocation failures here?

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 925

Quoted 2 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -1
    if (msto->disabled) {
-           drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 24 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -0
+           drm_dp_remove_payload_part1(mgr, mst_state, payload);
 
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
 base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +7 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /* IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */
 
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 548

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any pending

MST-related commits to

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 549

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   get committed to hardware by calling drm_crtc_commit_wait() on

each of the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 550

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 574

Quoted 5 lines
include/drm/display/drm_dp_mst_helper.h +1 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this payload

*/

Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload *payload); -

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

include/drm/display/drm_dp_mst_helper.h

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
+                            struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

Signature · 3 lines
Cheers,
 Lyude Paul (she/her)
 Software Engineer at Red Hat
author
#8 lore raw

RE: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

[Public]

Hi Lyude,

I'm afraid that I don't have the permissions to push and would like to have your help. Thanks!

Quoted 847 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Thursday, August 24, 2023 5:00 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 51 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 46 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 6 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Quoted 6 lines

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 5 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release

bandwidth

Quoted 33 lines
Quoted 33 lines
Quoted 7 lines

along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 8 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 11 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot
<[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159
+++++++++++------

-

Quoted 5 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
Quoted 6 lines
Quoted 6 lines
Quoted 1 line

diff --git

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

Quoted 4 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++

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

Quoted 174 lines
Quoted 174 lines
Quoted 19 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/ @@ -276,7 +275,7 @@

bool

dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
                                            new_payload, &old_payload);
            target_payload = &old_payload;

- drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

Quoted 1 line

+ drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    }

    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

Review bool

Quoted 2 lines
    int ret = 0;
(quoted diff) +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -2
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +7 -0
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link,
+ mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct

drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 7 lines
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
vc_start_slot,
                                     payload->time_slots);  }

-static int drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines

{
int ret;
struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 2 lines

+ * into the DPCD of DPRX. After calling this, the driver should
+ generate ACT

Quoted 8 lines
Quoted 8 lines

and payload packets.

Quoted 7 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 100 lines
Quoted 100 lines
Quoted 21 lines
                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 2 lines

+ "VCPI %d for port %p not in topology, not
+ creating a

payload

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;
    }

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -4
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST
+ payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along
+ the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 5 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 2 lines

+ * Removes a payload along the virtual channel if it was
+ successfully

allocated.

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT
+ and then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload
Quoted 3 lines
Quoted 3 lines

*old_payload,

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 39 lines
Quoted 39 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines

+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
+ *
+ * Updates the starting time slots of all other payloads which

Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +8 -0
+would have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's
+independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 307 lines
Quoted 307 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot >

new_payload-
vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots;

@@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3436

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation
+ for %s

failed,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for
Quoted 1 line

%p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
                    payload->port, ret);
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots; @@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
            }

            /* Now that previous state is committed, it's safe to

copy over

the start slot

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload,

&old_mst_state->payloads,

next) {

Quoted 2 lines
                    if (old_payload->delete) @@ -4502,6 +4533,8 @@

void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 1 line

new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 5 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 3 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot:
%u,

pbn_div: %d\n",

Quoted 7 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name
\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14]; @@ -4843,7 +4883,7 @@ void

drm_dp_mst_dump_topology(struct

seq_file *m,

Quoted 3 lines
                            continue;

                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

Quoted 1 line

- seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

Quoted 2 lines

+ seq_printf(m, " %5d %6d %6d %02d - %02d %5d
+ %5s

%8s %19s\n",

Quoted 4 lines
                               i,
                               payload->port->port_num,
                               payload->vcpi, @@ -4851,6 +4891,7

@@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 15 lines
                               payload->vc_start_slot + payload-
time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+
+ status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_i915_private *i915 = to_i915(connector->base.dev);

@@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

intel_audio_codec_disable(encoder, old_crtc_state,
old_conn_state); } @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,

    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 28 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9) diff --git

a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4e7c9c353c51..bba01fa0780c 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
@@ -882,21 +882,26 @@ struct nouveau_encoder
 *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)  {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder · line 905

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

Quoted 3 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling

VCPI

allocation failures here?

Quoted 2 lines
    if (msto->disabled) {

- drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 2 lines

+ drm_dp_remove_payload_part1(mgr, mst_state, payload);

Quoted 10 lines
Quoted 10 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_topology_ref_history { }; · line 46

Quoted 10 lines
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +0 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /*

IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */

Quoted 36 lines
Quoted 36 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 13 lines
include/drm/display/drm_dp_mst_helper.h +7 -0
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any

pending

MST-related commits to

Quoted 1 line

* get committed to hardware by calling drm_crtc_commit_wait() on

each of the

Quoted 1 line

* &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 575

Quoted 6 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this
+ payload

*/

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int

drm_dp_add_payload_part2(struct

Quoted 4 lines
Quoted 4 lines

drm_dp_mst_topology_mgr *mgr,

Quoted 3 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload
*payload); -

Quoted 8 lines
Quoted 8 lines

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 6 lines
Quoted 6 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

Quoted 1 line

+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 15 lines
Quoted 15 lines
Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 3 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

Quoted 8 lines
Quoted 3 lines

--
Regards,
Wayne

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

maintainer
#9 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Quoted 6 lines · Wayne

[Public]

Hi Lyude,

I'm afraid that I don't have the permissions to push and would like to have your help. Thanks!

Whoops, sorry I only just noticed this message. I set a reminder on my phone to bug me to push it tomorrow :), sorry about the delay

Quoted 860 lines
Quoted 848 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Thursday, August 24, 2023 5:00 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 51 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 46 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 6 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Quoted 6 lines

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 5 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release

bandwidth

Quoted 33 lines
Quoted 33 lines
Quoted 7 lines

along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 8 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 11 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot
<[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159
+++++++++++------

-

Quoted 5 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
Quoted 6 lines
Quoted 6 lines
Quoted 1 line

diff --git

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

Quoted 4 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++

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

Quoted 174 lines
Quoted 174 lines
Quoted 19 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/ @@ -276,7 +275,7 @@

bool

dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
                                            new_payload, &old_payload);
            target_payload = &old_payload;

- drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

Quoted 1 line

+ drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    }

    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

Review bool

Quoted 2 lines
    int ret = 0;
(quoted diff) +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -2
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +7 -0
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link,
+ mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct

drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 7 lines
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
vc_start_slot,
                                     payload->time_slots);  }

-static int drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines

{
int ret;
struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 2 lines

+ * into the DPCD of DPRX. After calling this, the driver should
+ generate ACT

Quoted 8 lines
Quoted 8 lines

and payload packets.

Quoted 7 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 100 lines
Quoted 100 lines
Quoted 21 lines
                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 2 lines

+ "VCPI %d for port %p not in topology, not
+ creating a

payload

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;
    }

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -4
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST
+ payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along
+ the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 5 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 2 lines

+ * Removes a payload along the virtual channel if it was
+ successfully

allocated.

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT
+ and then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload
Quoted 3 lines
Quoted 3 lines

*old_payload,

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 39 lines
Quoted 39 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines

+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
+ *
+ * Updates the starting time slots of all other payloads which

Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +8 -0
+would have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's
+independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 307 lines
Quoted 307 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot >

new_payload-
vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots;

@@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3436

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation
+ for %s

failed,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for
Quoted 1 line

%p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
                    payload->port, ret);
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots; @@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
            }

            /* Now that previous state is committed, it's safe to

copy over

the start slot

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload,

&old_mst_state->payloads,

next) {

Quoted 2 lines
                    if (old_payload->delete) @@ -4502,6 +4533,8 @@

void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 1 line

new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 5 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 3 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot:
%u,

pbn_div: %d\n",

Quoted 7 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name
\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14]; @@ -4843,7 +4883,7 @@ void

drm_dp_mst_dump_topology(struct

seq_file *m,

Quoted 3 lines
                            continue;

                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

Quoted 1 line

- seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

Quoted 2 lines

+ seq_printf(m, " %5d %6d %6d %02d - %02d %5d
+ %5s

%8s %19s\n",

Quoted 4 lines
                               i,
                               payload->port->port_num,
                               payload->vcpi, @@ -4851,6 +4891,7

@@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 15 lines
                               payload->vc_start_slot + payload-
time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+
+ status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_i915_private *i915 = to_i915(connector->base.dev);

@@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

intel_audio_codec_disable(encoder, old_crtc_state,
old_conn_state); } @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,

    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 28 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9) diff --git

a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4e7c9c353c51..bba01fa0780c 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
@@ -882,21 +882,26 @@ struct nouveau_encoder
 *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)  {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder · line 905

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

Quoted 3 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling

VCPI

allocation failures here?

Quoted 2 lines
    if (msto->disabled) {

- drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 2 lines

+ drm_dp_remove_payload_part1(mgr, mst_state, payload);

Quoted 10 lines
Quoted 10 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_topology_ref_history { }; · line 46

Quoted 10 lines
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +0 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /*

IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */

Quoted 36 lines
Quoted 36 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 13 lines
include/drm/display/drm_dp_mst_helper.h +7 -0
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any

pending

MST-related commits to

Quoted 1 line

* get committed to hardware by calling drm_crtc_commit_wait() on

each of the

Quoted 1 line

* &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 575

Quoted 6 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this
+ payload

*/

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int

drm_dp_add_payload_part2(struct

Quoted 4 lines
Quoted 4 lines

drm_dp_mst_topology_mgr *mgr,

Quoted 3 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload
*payload); -

Quoted 8 lines
Quoted 8 lines

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 6 lines
Quoted 6 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

Quoted 1 line

+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 15 lines
Quoted 15 lines
Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 3 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

Quoted 8 lines
Quoted 3 lines

--
Regards,
Wayne

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

Signature · 3 lines
Cheers,
 Lyude Paul (she/her)
 Software Engineer at Red Hat
#10 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Quoted 4 lines · Lyude Paul
Quoted 2 lines · Wayne

[Public]

Quoted 8 lines
Quoted 4 lines

Hi Lyude,

I'm afraid that I don't have the permissions to push and would like to have your help. Thanks!

Whoops, sorry I only just noticed this message. I set a reminder on my phone to bug me to push it tomorrow :), sorry about the delay

Wayne, I don't see why we couldn't give you commit permissions for drm-misc.

Alex

Quoted 866 lines
Quoted 852 lines
Quoted 852 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Thursday, August 24, 2023 5:00 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 51 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 46 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines · Wayne Lin

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them for better understanding.

Quoted 5 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 6 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Quoted 6 lines

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

the

Quoted 5 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release

bandwidth

Quoted 33 lines
Quoted 33 lines
Quoted 7 lines

along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 8 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 11 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot
<[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159
+++++++++++------

-

Quoted 5 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)
Quoted 6 lines
Quoted 6 lines
Quoted 1 line

diff --git

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

Quoted 4 lines

b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c index d9a482908380..9ad509279b0a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++

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

Quoted 174 lines
Quoted 174 lines
Quoted 19 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
@@ -219,7 +219,7 @@ static void dm_helpers_construct_old_payload(
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -2
-
-   /* It's OK for this to fail */
    new_payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/ @@ -276,7 +275,7 @@

bool

dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
                                            new_payload, &old_payload);
            target_payload = &old_payload;

- drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

Quoted 1 line

+ drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    }

    /* mst_mgr->->payloads are VC payload notify MST branch using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 6 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

Review bool

Quoted 2 lines
    int ret = 0;
(quoted diff) +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +2 -2
+   new_payload = drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c bool dm_helpers_dp_mst_send_payload_allocation(

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +7 -0
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link,
+ mst_state-
 pbn_div,
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +1 -0
+   }
 
    if (ret) {
            amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct

drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 7 lines
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
vc_start_slot,
                                     payload->time_slots);  }

-static int drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 4 lines

{
int ret;
struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 8 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-   drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi, 0);
-   drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-

vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 3 lines

+ drm_dp_payload_send_msg(mgr, payload->port, payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_create_payload_step2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload, and

programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 2 lines

+ * into the DPCD of DPRX. After calling this, the driver should
+ generate ACT

Quoted 8 lines
Quoted 8 lines

and payload packets.

Quoted 7 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure.
*/
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 100 lines
Quoted 100 lines
Quoted 21 lines
                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +12 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port */
    port = drm_dp_mst_topology_get_port_validated(mgr, payload-
port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 2 lines

+ "VCPI %d for port %p not in topology, not
+ creating a

payload

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;
    }

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -4
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST
+ payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload along
+ the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was successfully
Quoted 5 lines

assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 2 lines

+ * Removes a payload along the virtual channel if it was
+ successfully

allocated.

Quoted 7 lines

+ * After calling this, the driver should set HW to generate ACT
+ and then switch to new
+ * payload allocation state.
*/

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -3
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload
Quoted 3 lines
Quoted 3 lines

*old_payload,

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 39 lines
Quoted 39 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 11 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -6
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
 
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr-

drivers/gpu/drm/display/drm_dp_mst_topology.c static int drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 8 lines

mst_primary);
+ send_remove = drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 2 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in

topology, not sending remove\n",

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
Quoted 16 lines
Quoted 8 lines
Quoted 8 lines

+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
+ *
+ * Updates the starting time slots of all other payloads which

Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +8 -0
+would have been shifted towards
+ * the start of the payload ID table as a result of removing a
+payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's
+independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual channel.
+ */
+void drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 307 lines
Quoted 307 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload) {

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot >

new_payload-
vc_start_slot)

                    pos->vc_start_slot -= old_payload->time_slots;

@@ -

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct

Quoted 14 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
 
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int drm_dp_add_payload_part2(struct

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_add_payload_part2(struct · line 3436

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload creation
+ for %s

failed,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST payload for
Quoted 1 line

%p

failed: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct

Quoted 9 lines
                    payload->port, ret);
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

drivers/gpu/drm/display/drm_dp_mst_topology.c int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots; @@ -4493,7 +4524,7 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 4 lines
            }

            /* Now that previous state is committed, it's safe to

copy over

the start slot

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload,

&old_mst_state->payloads,

next) {

Quoted 2 lines
                    if (old_payload->delete) @@ -4502,6 +4533,8 @@

void

drm_dp_mst_atomic_wait_for_dependencies(struct drm_atomic_state *state)

Quoted 1 line

new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 5 lines
                    new_payload->vc_start_slot = old_payload-

vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+                   new_payload->payload_allocation_status =
+                                                   old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void drm_dp_mst_dump_topology(struct seq_file *m,

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 3 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot:
%u,

pbn_div: %d\n",

Quoted 7 lines
               state->payload_mask, mgr->max_payloads, state-

start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink name
\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status | sink

name |\n");

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14]; @@ -4843,7 +4883,7 @@ void

drm_dp_mst_dump_topology(struct

seq_file *m,

Quoted 3 lines
                            continue;

                    fetch_monitor_name(mgr, payload->port, name,

sizeof(name));

Quoted 1 line

- seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

Quoted 2 lines

+ seq_printf(m, " %5d %6d %6d %02d - %02d %5d
+ %5s

%8s %19s\n",

Quoted 4 lines
                               i,
                               payload->port->port_num,
                               payload->vcpi, @@ -4851,6 +4891,7

@@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 15 lines
                               payload->vc_start_slot + payload-
time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" : "N",
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+
+ status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
            drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 565

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 563

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct intel_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_i915_private *i915 = to_i915(connector->base.dev);

@@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines

+new_payload);

intel_audio_codec_disable(encoder, old_crtc_state,
old_conn_state); } @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,

    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+           drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_post_disable_dp(struct · line 615

Quoted 9 lines
    struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void intel_mst_post_disable_dp(struct
 intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 28 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9) diff --git

a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4e7c9c353c51..bba01fa0780c 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c +5 -3
@@ -882,21 +882,26 @@ struct nouveau_encoder
 *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)  {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state, msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder · line 905

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state, msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state

Quoted 8 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state, new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct drm_atomic_state

*state,

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state *state,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -3
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n", msto->encoder.name);
 
-   old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_prepare(struct drm_atomic_state · line 922

Quoted 4 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -2
-
    payload = drm_atomic_get_mst_payload_state(mst_state, mstc-
 port);
-   old_payload = drm_atomic_get_mst_payload_state(old_mst_state,

mstc->port);

Quoted 3 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
    // TODO: Figure out if we want to do a better job of handling

VCPI

allocation failures here?

Quoted 2 lines
    if (msto->disabled) {

- drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 2 lines

+ drm_dp_remove_payload_part1(mgr, mst_state, payload);

Quoted 10 lines
Quoted 10 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_topology_ref_history { }; · line 46

Quoted 10 lines
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head-
base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +0 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {  };
 #endif /*

IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */

Quoted 36 lines
Quoted 36 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 13 lines
include/drm/display/drm_dp_mst_helper.h +7 -0
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been called,

which will ensure the

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 545

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over to

the new state. Note

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 546

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this payload

until

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 540

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload() have

been called.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 547

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *   drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

have been called.

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for any

pending

MST-related commits to

Quoted 1 line

* get committed to hardware by calling drm_crtc_commit_wait() on

each of the

Quoted 1 line

* &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 575

Quoted 6 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled */
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of this
+ payload

*/

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
+   enum drm_dp_mst_payload_allocation payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int

drm_dp_add_payload_part2(struct

Quoted 4 lines
Quoted 4 lines

drm_dp_mst_topology_mgr *mgr,

Quoted 3 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload
*payload); -

Quoted 8 lines
Quoted 8 lines

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 6 lines
Quoted 6 lines

*mgr,

Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*payload); void

Quoted 1 line

+drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 18 lines
Quoted 8 lines
Quoted 1 line

+ struct drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

+ struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

Quoted 8 lines
Quoted 4 lines

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

author
#11 lore raw

RE: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

[Public]

Thank you Lyude and Alex!

Regards,
Wayne

Quoted 968 lines

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Saturday, September 2, 2023 3:38 AM
To: Lyude Paul <[email protected]>
Cc: Lin, Wayne <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>; [email protected]
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Quoted 4 lines · Lyude Paul
Quoted 2 lines · Wayne

[Public]

Quoted 8 lines
Quoted 4 lines

Hi Lyude,

I'm afraid that I don't have the permissions to push and would like to have your help. Thanks!

Whoops, sorry I only just noticed this message. I set a reminder on my phone to bug me to push it tomorrow :), sorry about the delay

Wayne, I don't see why we couldn't give you commit permissions for drm- misc.

Alex

Quoted 34 lines
Quoted 34 lines
Quoted 34 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Thursday, August 24, 2023 5:00 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 18 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 13 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines · Wayne Lin
Quoted 7 lines

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them

for better understanding.

Quoted 55 lines
Quoted 55 lines
Quoted 55 lines
Quoted 20 lines
Quoted 20 lines
Quoted 7 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 12 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

Quoted 6 lines
Quoted 6 lines

the

Quoted 5 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release

bandwidth

Quoted 28 lines
Quoted 28 lines
Quoted 8 lines

along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 8 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 11 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot
<[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159
+++++++++++------

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

-

Quoted 6 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)

diff --git

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

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

index d9a482908380..9ad509279b0a 100644
---

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

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

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

Quoted 1 line
Quoted 1 line

Review static void

Quoted 1 line
(quoted diff) +0 -0
@@ -219,7 +219,7 @@ static void

dm_helpers_construct_old_payload(

Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 20 lines
(quoted diff) +1 -1
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state =

to_drm_dp_mst_topology_state(mst_mgr->base.state);

(quoted diff) +0 -2
-
-   /* It's OK for this to fail */
    new_payload =

drm_atomic_get_mst_payload_state(mst_state,
aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/ @@ -276,7

+275,7 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
                                            new_payload, &old_payload);
            target_payload = &old_payload;

- drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

Quoted 1 line

+ drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 4 lines
    }

    /* mst_mgr->->payloads are VC payload notify MST branch

using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

Review

Quoted 7 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
(quoted diff) +2 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload,
+ *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

Review bool

Quoted 2 lines
    int ret = 0;
(quoted diff) +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

Review bool · line 359

Quoted 5 lines
(quoted diff) +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state =
 to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 20 lines
(quoted diff) +9 -2
+   new_payload =
+ drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr,
+ mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link,
+ mst_state-

pbn_div,

Review

Quoted 2 lines
(quoted diff) +2 -0
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 11 lines

+ }

    if (ret) {

amdgpu_dm_set_mst_status(&aconnector->mst_status,

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct

drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 8 lines
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi,
payload- vc_start_slot,
                                     payload->time_slots);
}

-static int drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 5 lines

{
int ret;
struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int
drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 5 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */

- drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi,

0);

Quoted 131 lines
Quoted 131 lines
Quoted 131 lines
Quoted 31 lines
Quoted 31 lines
Quoted 3 lines

- drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 4 lines

+ drm_dp_payload_send_msg(mgr, payload->port,
+ payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload,

and programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 2 lines

+ * into the DPCD of DPRX. After calling this, the driver
+ should generate ACT

Quoted 8 lines
Quoted 8 lines

and payload packets.

Quoted 7 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure. */
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 91 lines
Quoted 91 lines
Quoted 22 lines
                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +13 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port
+ */
    port = drm_dp_mst_topology_get_port_validated(mgr,
payload- port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 2 lines

+ "VCPI %d for port %p not in
+ topology, not creating a

payload

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;
    }

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -4
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST
+ payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload
+ along the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was
Quoted 5 lines

successfully assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines

+ * Removes a payload along the virtual channel if it was
+ successfully

allocated.

Quoted 5 lines

+ * After calling this, the driver should set HW to generate
+ ACT and then switch to new
+ * payload allocation state.
*/
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 12 lines
Quoted 12 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 5 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -5
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port,

mgr-

Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 9 lines

mst_primary);
+ send_remove =
+ drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 3 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not

in

topology, not sending remove\n",

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload
+locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 8 lines

+ *
+ * Updates the starting time slots of all other payloads

drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -0
+which would have been shifted towards
+ * the start of the payload ID table as a result of
+removing a payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's
+independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual

channel.

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

+ */
+void drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 19 lines
Quoted 19 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*new_payload) {

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot >

new_payload-
vc_start_slot)

                    pos->vc_start_slot -=

old_payload->time_slots; @@ -

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct

drm_dp_mst_topology_mgr

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

*mgr,

Quoted 6 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -0
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int

drm_dp_add_payload_part2(struct

Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3407

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3436

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload
+ creation for %s

failed,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST
Quoted 1 line

payload for %p

failed: %d\n",

Quoted 10 lines
                    payload->port, ret);
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int

drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

Quoted 9 lines
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots; @@ -4493,7 +4524,7 @@

void

drm_dp_mst_atomic_wait_for_dependencies(struct
drm_atomic_state
*state)

Quoted 4 lines
            }

            /* Now that previous state is committed, it's

safe to copy over

the start slot

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload,

&old_mst_state->payloads,

next) {

Quoted 2 lines
                    if (old_payload->delete) @@ -4502,6

+4533,8 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct
drm_atomic_state
*state)

Quoted 1 line

new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 6 lines
                    new_payload->vc_start_slot =

old_payload- vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+                   new_payload->payload_allocation_status =
+
+ old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void

drm_dp_mst_dump_topology(struct

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4863

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 3 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot:
%u,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

pbn_div: %d\n",

Quoted 5 lines
               state->payload_mask, mgr->max_payloads,

state- start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink

name

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status |

sink

Quoted 81 lines
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines

name |\n");

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14]; @@ -4843,7 +4883,7 @@

void drm_dp_mst_dump_topology(struct

seq_file *m,

Quoted 4 lines
                            continue;

                    fetch_monitor_name(mgr, payload->port,

name,

sizeof(name));

Quoted 1 line

- seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

Quoted 2 lines

+ seq_printf(m, " %5d %6d %6d %02d - %02d
+ %5d %5s

%8s %19s\n",

Quoted 4 lines
                               i,
                               payload->port->port_num,
                               payload->vcpi, @@ -4851,6

+4891,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 16 lines
                               payload->vc_start_slot +
payload- time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" :

"N",

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+
+ status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 562

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
 
 drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 566

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 564

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines
    struct drm_i915_private *i915 =

to_i915(connector->base.dev); @@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 11 lines

+new_payload);

intel_audio_codec_disable(encoder, old_crtc_state,
old_conn_state); } @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,

    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+
+ drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+
+ drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

Quoted 87 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

Quoted 1 line
    struct drm_i915_private *dev_priv = to_i915(connector-

base.dev);

Quoted 79 lines
Quoted 79 lines
Quoted 79 lines
Quoted 79 lines

drivers/gpu/drm/i915/display/intel_dp_mst.c static void · line 615

Quoted 8 lines
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void
 intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 32 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9) diff --git

a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4e7c9c353c51..bba01fa0780c 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c +9 -3
@@ -882,21 +882,26 @@ struct nouveau_encoder
 *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state
+ *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)  {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,
+ msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -0
+ msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n",
 msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state,
+ new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct

drm_atomic_state

*state,

Quoted 11 lines
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -2
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n",

msto->encoder.name);

- old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

Quoted 4 lines

-
payload = drm_atomic_get_mst_payload_state(mst_state,
mstc- port);
- old_payload =

drm_atomic_get_mst_payload_state(old_mst_state,

Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Quoted 11 lines
Quoted 11 lines

mstc->port);

Quoted 3 lines
    // TODO: Figure out if we want to do a better job of

handling VCPI

allocation failures here?

Quoted 2 lines
    if (msto->disabled) {

- drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 3 lines

+ drm_dp_remove_payload_part1(mgr, mst_state,
+ payload);

Quoted 10 lines
Quoted 10 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_topology_ref_history { · line 46

Quoted 10 lines
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp,
msto->head- base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +0 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {
 }; #endif /*

IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
include/drm/display/drm_dp_mst_helper.h +7 -0
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 3 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been

called,

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

which will ensure the

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over

to

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

the new state. Note

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this

payload

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

until

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload()

have

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

been called.

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *

drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

have been called.

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for

any pending

MST-related commits to

Quoted 1 line

* get committed to hardware by calling drm_crtc_commit_wait()

on

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

each of the

Quoted 1 line

* &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 571

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled

*/

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 5 lines
Quoted 5 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 575

Quoted 4 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of
+ this payload

*/

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/drm/display/drm_dp_mst_helper.h +3 -0
+   enum drm_dp_mst_payload_allocation
+ payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int

drm_dp_add_payload_part2(struct

Quoted 4 lines
Quoted 4 lines

drm_dp_mst_topology_mgr *mgr,

Quoted 3 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload
*payload); -

Quoted 8 lines
Quoted 8 lines

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload); void

Quoted 1 line

+drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 37 lines
Quoted 23 lines
Quoted 23 lines

*mgr,

Quoted 21 lines
Quoted 10 lines
Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line
Quoted 8 lines
Quoted 3 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr
*mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

Quoted 8 lines
Quoted 4 lines

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

#12 lore raw

Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Quoted 3 lines · Wayne

[Public]

Thank you Lyude and Alex!

This patch had i915 changes, please also Cc the [email protected] list for such patchsets, so that we get CI test results for it.

Also, I think patches with i915 changes need an Ack from an i915 developer before pushing.

Thanks,
Imre

Quoted 970 lines

Regards,
Wayne

Quoted 968 lines

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Saturday, September 2, 2023 3:38 AM
To: Lyude Paul <[email protected]>
Cc: Lin, Wayne <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>; [email protected]
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Quoted 4 lines · Lyude Paul
Quoted 2 lines · Wayne

[Public]

Quoted 8 lines
Quoted 4 lines

Hi Lyude,

I'm afraid that I don't have the permissions to push and would like to have your help. Thanks!

Whoops, sorry I only just noticed this message. I set a reminder on my phone to bug me to push it tomorrow :), sorry about the delay

Wayne, I don't see why we couldn't give you commit permissions for drm- misc.

Alex

Quoted 34 lines
Quoted 34 lines
Quoted 34 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Thursday, August 24, 2023 5:00 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Sure - you're also welcome to push the first two patches after fixing the indentation if you'd like

Quoted 18 lines · Wayne

[Public]

Thanks, Lyude!
Should I push another version to fix the indention?

Quoted 13 lines

-----Original Message-----
From: Lyude Paul <[email protected]>
Sent: Friday, August 18, 2023 6:17 AM
To: Lin, Wayne <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wentland, Harry <[email protected]>; Zuo, Jerry <[email protected]>
Subject: Re: [Patch v2 2/3] drm/mst: Refactor the flow for payload allocation/removement

Two small comments:

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines · Wayne Lin
Quoted 7 lines

[Why]
Today, the allocation/deallocation steps and status is a bit unclear.

For instance, payload->vc_start_slot = -1 stands for "the failure of updating DPCD payload ID table" and can also represent as "payload is not allocated yet". These two cases should be handled differently and hence better to distinguish them

for better understanding.

Quoted 55 lines
Quoted 55 lines
Quoted 55 lines
Quoted 20 lines
Quoted 20 lines
Quoted 7 lines

[How]
Define enumeration - ALLOCATION_LOCAL, ALLOCATION_DFP and ALLOCATION_REMOTE to distinguish different allocation status. Adjust the code to handle different status accordingly for better understanding the sequence of payload allocation and payload

removement.

Quoted 12 lines

For payload creation, the procedure should look like this:
DRM part 1:
* step 1 - update sw mst mgr variables to add a new payload
* step 2 - add payload at immediate DFP DPCD payload table

Driver:
* Add new payload in HW and sync up with DFP by sending ACT

DRM Part 2:
* Send ALLOCATE_PAYLOAD sideband message to allocate bandwidth along

Quoted 6 lines
Quoted 6 lines

the

Quoted 5 lines

virtual channel.

And as for payload removement, the procedure should look like this:
DRM part 1:
* step 1 - Send ALLOCATE_PAYLOAD sideband message to release

bandwidth

Quoted 28 lines
Quoted 28 lines
Quoted 8 lines

along the virtual channel
* step 2 - Clear payload allocation at immediate DFP DPCD payload table

Driver:
* Remove the payload in HW and sync up with DFP by sending ACT

Quoted 8 lines

DRM part 2:
* update sw mst mgr variables to remove the payload

Note that it's fine to fail when communicate with the branch device connected at immediate downstrean-facing port, but updating variables of SW mst mgr and HW configuration should be conducted anyway. That's because it's under commit_tail and we need to complete the HW

programming.

Quoted 11 lines

Changes since v1:
* Remove the set but not use variable 'old_payload' in function 'nv50_msto_prepare'. Catched by kernel test robot
<[email protected]>

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c |  20 ++-

drivers/gpu/drm/display/drm_dp_mst_topology.c | 159
+++++++++++------

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

-

Quoted 6 lines
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  18 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  21 +--
 include/drm/display/drm_dp_mst_helper.h       |  23 ++-
 5 files changed, 153 insertions(+), 88 deletions(-)

diff --git

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

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

index d9a482908380..9ad509279b0a 100644
---

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

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

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

Quoted 1 line
Quoted 1 line

Review static void

Quoted 1 line
(quoted diff) +0 -0
@@ -219,7 +219,7 @@ static void

dm_helpers_construct_old_payload(

Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 147 lines
Quoted 20 lines
(quoted diff) +1 -1
    /* Set correct time_slots/PBN of old payload.
     * other fields (delete & dsc_enabled) in
     * struct drm_dp_mst_atomic_payload are don't care fields
-    * while calling drm_dp_remove_payload()
+    * while calling drm_dp_remove_payload_part2()
     */
    for (i = 0; i < current_link_table.stream_count; i++) {
            dc_alloc =
@@ -262,13 +262,12 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state =

to_drm_dp_mst_topology_state(mst_mgr->base.state);

(quoted diff) +0 -2
-
-   /* It's OK for this to fail */
    new_payload =

drm_atomic_get_mst_payload_state(mst_state,
aconnector->mst_output_port);

Quoted 5 lines
    if (enable) {
            target_payload = new_payload;

+ /* It's OK for this to fail */
drm_dp_add_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 3 lines
    } else {
            /* construct old payload by VCPI*/ @@ -276,7

+275,7 @@ bool

dm_helpers_dp_mst_write_payload_allocation_table(

Quoted 4 lines
                                            new_payload, &old_payload);
            target_payload = &old_payload;

- drm_dp_remove_payload(mst_mgr, mst_state,

&old_payload, new_payload);

Quoted 1 line

+ drm_dp_remove_payload_part1(mst_mgr, mst_state,

new_payload);

Quoted 4 lines
    }

    /* mst_mgr->->payloads are VC payload notify MST branch

using

DPCD

Quoted 1 line

or @@ -342,7 +341,7 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

Review

Quoted 7 lines
    struct amdgpu_dm_connector *aconnector;
    struct drm_dp_mst_topology_state *mst_state;
    struct drm_dp_mst_topology_mgr *mst_mgr;
(quoted diff) +2 -1
-   struct drm_dp_mst_atomic_payload *payload;
+   struct drm_dp_mst_atomic_payload *new_payload,
+ *old_payload;
    enum mst_progress_status set_flag =

MST_ALLOCATE_NEW_PAYLOAD;

Quoted 1 line

enum mst_progress_status clr_flag =

MST_CLEAR_ALLOCATED_PAYLOAD;

Review bool

Quoted 2 lines
    int ret = 0;
(quoted diff) +0 -0
@@ -355,15 +354,20 @@ bool

dm_helpers_dp_mst_send_payload_allocation(

Review bool · line 359

Quoted 5 lines
(quoted diff) +0 -1
    mst_mgr = &aconnector->mst_root->mst_mgr;
    mst_state =
 to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-   payload = drm_atomic_get_mst_payload_state(mst_state,

aconnector->mst_output_port);

Quoted 20 lines
(quoted diff) +9 -2
+   new_payload =
+ drm_atomic_get_mst_payload_state(mst_state,
+aconnector->mst_output_port);
 
    if (!enable) {
            set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
            clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
    }
 
-   if (enable)
-           ret = drm_dp_add_payload_part2(mst_mgr, mst_state-
 base.state, payload);
+   if (enable) {
+           ret = drm_dp_add_payload_part2(mst_mgr,
+ mst_state-
 base.state, new_payload);
+   } else {
+           dm_helpers_construct_old_payload(stream->link,
+ mst_state-

pbn_div,

Review

Quoted 2 lines
(quoted diff) +2 -0
+                                            new_payload, old_payload);
+           drm_dp_remove_payload_part2(mst_mgr, mst_state,

old_payload, new_payload);

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 11 lines

+ }

    if (ret) {

amdgpu_dm_set_mst_status(&aconnector->mst_status,

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
index 4d80426757ab..e04f87ff755a 100644
@@ -3255,15 +3255,15 @@ int

drm_dp_send_query_stream_enc_status(struct

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -1
 drm_dp_mst_topology_mgr *mgr,  }
 EXPORT_SYMBOL(drm_dp_send_query_stream_enc_status);
 
-static int drm_dp_create_payload_step1(struct

drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_at_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 8 lines
 {
    return drm_dp_dpcd_write_payload(mgr, payload->vcpi,
payload- vc_start_slot,
                                     payload->time_slots);
}

-static int drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr

*mgr,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static int drm_dp_create_payload_to_remote(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 5 lines

{
int ret;
struct drm_dp_mst_port *port =
drm_dp_mst_topology_get_port_validated(mgr, payload->port); @@ -

3276,17 +3276,20 @@ static int
drm_dp_create_payload_step2(struct
drm_dp_mst_topology_mgr *mgr,

Quoted 4 lines
    return ret;

}

-static int drm_dp_destroy_payload_step1(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

- struct drm_dp_mst_topology_state

*mst_state,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*payload)

Quoted 1 line

+static void drm_dp_destroy_payload_at_remote_and_dfp(struct

drm_dp_mst_topology_mgr *mgr,

Quoted 1 line

+ struct

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drm_dp_mst_topology_state *mst_state,

Quoted 1 line

+ struct

drm_dp_mst_atomic_payload *payload)

Quoted 5 lines
 {
    drm_dbg_kms(mgr->dev, "\n");

    /* it's okay for these to fail */

- drm_dp_payload_send_msg(mgr, payload->port, payload->vcpi,

0);

Quoted 131 lines
Quoted 131 lines
Quoted 131 lines
Quoted 31 lines
Quoted 31 lines
Quoted 3 lines

- drm_dp_dpcd_write_payload(mgr, payload->vcpi, payload-
vc_start_slot, 0);
+ if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE) {

Quoted 4 lines

+ drm_dp_payload_send_msg(mgr, payload->port,
+ payload-
vcpi, 0);
+ payload->payload_allocation_status =

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 4 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -1
+   }
 
-   return 0;
+   if (payload->payload_allocation_status ==

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP)

drivers/gpu/drm/display/drm_dp_mst_topology.c static int

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dp_dpcd_write_payload(mgr, payload->vcpi,
+payload->vc_start_slot, 0);
 }
 
 /**
@@ -3296,81 +3299,105 @@ static int

drm_dp_destroy_payload_step1(struct drm_dp_mst_topology_mgr *mgr,

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
  * @payload: The payload to write
  *
  * Determines the starting time slot for the given payload,

and programs the VCPI for this payload
- * into hardware. After calling this, the driver should generate ACT and

payload packets.

Quoted 2 lines

+ * into the DPCD of DPRX. After calling this, the driver
+ should generate ACT

Quoted 8 lines
Quoted 8 lines

and payload packets.

Quoted 7 lines

*
- * Returns: 0 on success, error code on failure. In the event that this fails,
- * @payload.vc_start_slot will also be set to -1.
+ * Returns: 0 on success, error code on failure. */
int drm_dp_add_payload_part1(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 91 lines
Quoted 91 lines
Quoted 22 lines
                         struct drm_dp_mst_topology_state *mst_state,
                         struct drm_dp_mst_atomic_payload *payload)  {
    struct drm_dp_mst_port *port;
drivers/gpu/drm/display/drm_dp_mst_topology.c +13 -1
-   int ret;
+   int ret = 0;
+   bool allocate = true;
+
+   /* Update mst mgr info */
+   if (mgr->payload_count == 0)
+           mgr->next_start_slot = mst_state->start_slot;
+
+   payload->vc_start_slot = mgr->next_start_slot;
+
+   mgr->payload_count++;
+   mgr->next_start_slot += payload->time_slots;
 
+   /* Allocate payload to immediate downstream facing port
+ */
    port = drm_dp_mst_topology_get_port_validated(mgr,
payload- port);
    if (!port) {
            drm_dbg_kms(mgr->dev,
Quoted 1 line

- "VCPI %d for port %p not in topology, not creating a

payload\n",

Quoted 2 lines

+ "VCPI %d for port %p not in
+ topology, not creating a

payload

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -2
+to remote\n",
                        payload->vcpi, payload->port);
-           payload->vc_start_slot = -1;
-           return 0;
+           allocate = false;
    }

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 10 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +5 -4
 
-   if (mgr->payload_count == 0)
-           mgr->next_start_slot = mst_state->start_slot;
-
-   payload->vc_start_slot = mgr->next_start_slot;
+   if (allocate) {
+           ret = drm_dp_create_payload_at_dfp(mgr, payload);
+           if (ret < 0)
+                   drm_warn(mgr->dev, "Failed to create MST
+ payload

for port %p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -4
+                            payload->port, ret);
 
-   ret = drm_dp_create_payload_step1(mgr, payload);
-   drm_dp_mst_topology_put_port(port);
-   if (ret < 0) {
-           drm_warn(mgr->dev, "Failed to create MST payload for port

%p: %d\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -5
-                    payload->port, ret);
-           payload->vc_start_slot = -1;
-           return ret;
    }
 
-   mgr->payload_count++;
-   mgr->next_start_slot += payload->time_slots;
+   payload->payload_allocation_status =
+           (!allocate || ret < 0) ?

DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL :

Quoted 1 line

+

      DRM_DP_MST_PAYLOAD_ALLOCATION_DFP;

Just need to fix indenting here

Quoted 19 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -5
-   return 0;
+   drm_dp_mst_topology_put_port(port);
+
+   return ret;
 }
 EXPORT_SYMBOL(drm_dp_add_payload_part1);
 
 /**
- * drm_dp_remove_payload() - Remove an MST payload
+ * drm_dp_remove_payload_part1() - Remove an MST payload
+ along the virtual channel
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload to write
+ * @payload: The payload to remove
  *
- * Removes a payload from an MST topology if it was
Quoted 5 lines

successfully assigned a start slot. Also updates
- * the starting time slots of all other payloads which would have been shifted towards the start of
- * the VC table as a result. After calling this, the driver should generate ACT

and payload packets.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 2 lines

+ * Removes a payload along the virtual channel if it was
+ successfully

allocated.

Quoted 5 lines

+ * After calling this, the driver should set HW to generate
+ ACT and then switch to new
+ * payload allocation state.
*/
-void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr

*mgr,

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-                      struct drm_dp_mst_atomic_payload *new_payload)
+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 12 lines
Quoted 12 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload)

Quoted 5 lines

{

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-   struct drm_dp_mst_atomic_payload *pos;
+   /* Remove remote payload allocation */
    bool send_remove = false;
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 6 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -5
-   /* We failed to make the payload, so nothing to do */
-   if (new_payload->vc_start_slot == -1)
-           return;
-
    mutex_lock(&mgr->lock);
-   send_remove =

drm_dp_mst_port_downstream_of_branch(new_payload->port,

mgr-

Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 9 lines

mst_primary);
+ send_remove =
+ drm_dp_mst_port_downstream_of_branch(payload-
port,

drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
+mgr->mst_primary);
    mutex_unlock(&mgr->lock);
 
    if (send_remove)
-           drm_dp_destroy_payload_step1(mgr, mst_state,

new_payload);

Quoted 1 line

+ drm_dp_destroy_payload_at_remote_and_dfp(mgr,

mst_state, payload);

Quoted 3 lines
    else
            drm_dbg_kms(mgr->dev, "Payload for VCPI %d not

in

topology, not sending remove\n",

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -1
-                       new_payload->vcpi);
+                       payload->vcpi);
+
+   payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part1);
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
+/**
+ * drm_dp_remove_payload_part2() - Remove an MST payload
+locally
+ * @mgr: Manager to use.
+ * @mst_state: The MST atomic state
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload with its latest state
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c

Quoted 8 lines

+ *
+ * Updates the starting time slots of all other payloads

drivers/gpu/drm/display/drm_dp_mst_topology.c +6 -0
+which would have been shifted towards
+ * the start of the payload ID table as a result of
+removing a payload. Driver should call this
+ * function whenever it removes a payload in its HW. It's
+independent to the result of payload
+ * allocation/deallocation at branch devices along the virtual

channel.

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

+ */
+void drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 19 lines
Quoted 19 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*new_payload) {

Quoted 9 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+   struct drm_dp_mst_atomic_payload *pos;
+
+   /* Remove local payload allocation */
    list_for_each_entry(pos, &mst_state->payloads, next) {
            if (pos != new_payload && pos->vc_start_slot >

new_payload-
vc_start_slot)

                    pos->vc_start_slot -=

old_payload->time_slots; @@ -

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

3382,9 +3409,10

Quoted 1 line

@@ void drm_dp_remove_payload(struct

drm_dp_mst_topology_mgr

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

*mgr,

Quoted 6 lines
    if (new_payload->delete)
            drm_dp_mst_put_port_malloc(new_payload->port);
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
-}
-EXPORT_SYMBOL(drm_dp_remove_payload);
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/display/drm_dp_mst_topology.c int

Quoted 8 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -0
+   new_payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+}
+EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
  * drm_dp_add_payload_part2() - Execute payload update part 2
  * @mgr: Manager to use.
@@ -3403,17 +3431,19 @@ int

drm_dp_add_payload_part2(struct

Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines
Quoted 80 lines

drm_dp_mst_topology_mgr *mgr,

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3407

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -2
    int ret = 0;
 
    /* Skip failed payloads */
-   if (payload->vc_start_slot == -1) {
-           drm_dbg_kms(mgr->dev, "Part 1 of payload creation for %s

failed, skipping part 2\n",

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3434

Quoted 1 line
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -0
+   if (payload->payload_allocation_status !=

DRM_DP_MST_PAYLOAD_ALLOCATION_DFP) {

drivers/gpu/drm/display/drm_dp_mst_topology.c int · line 3436

Quoted 2 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           drm_dbg_kms(state->dev, "Part 1 of payload
+ creation for %s

failed,

Quoted 11 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +4 -2
+skipping part 2\n",
                        payload->port->connector->name);
            return -EIO;
    }
 
-   ret = drm_dp_create_payload_step2(mgr, payload);
-   if (ret < 0) {
+   /* Allocate payload to remote end */
+   ret = drm_dp_create_payload_to_remote(mgr, payload);
+   if (ret < 0)
            drm_err(mgr->dev, "Step 2 of creating MST
Quoted 1 line

payload for %p

failed: %d\n",

Quoted 10 lines
                    payload->port, ret);
drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -1
-   }
+   else
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE;
 
    return ret;
 }
@@ -4324,6 +4354,7 @@ int

drm_dp_atomic_find_time_slots(struct

drm_atomic_state *state,

Quoted 9 lines
            drm_dp_mst_get_port_malloc(port);
            payload->port = port;
            payload->vc_start_slot = -1;
drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+           payload->payload_allocation_status =
+DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
            list_add(&payload->next, &topology_state->payloads);
    }
    payload->time_slots = req_slots; @@ -4493,7 +4524,7 @@

void

drm_dp_mst_atomic_wait_for_dependencies(struct
drm_atomic_state
*state)

Quoted 4 lines
            }

            /* Now that previous state is committed, it's

safe to copy over

the start slot

Quoted 5 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +1 -1
-            * assignments
+            * and allocation status assignments
             */
            list_for_each_entry(old_payload,

&old_mst_state->payloads,

next) {

Quoted 2 lines
                    if (old_payload->delete) @@ -4502,6

+4533,8 @@ void

drm_dp_mst_atomic_wait_for_dependencies(struct
drm_atomic_state
*state)

Quoted 1 line

new_payload =

drm_atomic_get_mst_payload_state(new_mst_state,

Quoted 1 line

old_payload->port);

Quoted 6 lines
                    new_payload->vc_start_slot =

old_payload- vc_start_slot;

drivers/gpu/drm/display/drm_dp_mst_topology.c +3 -0
+                   new_payload->payload_allocation_status =
+
+ old_payload-

payload_allocation_status;

And here. Besides that, I think patches 1/3 and 2/3 look great! Just finished testing them on nouveau:

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Patch 3/3 I gotta think about a bit more (and am curious about Imre's current take on it) I think

drivers/gpu/drm/display/drm_dp_mst_topology.c void

Quoted 4 lines
            }
    }

}

drivers/gpu/drm/display/drm_dp_mst_topology.c +0 -0
@@ -4818,6 +4851,13 @@ void

drm_dp_mst_dump_topology(struct

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines

seq_file *m,

drivers/gpu/drm/display/drm_dp_mst_topology.c void · line 4863

Quoted 13 lines
drivers/gpu/drm/display/drm_dp_mst_topology.c +7 -0
    struct drm_dp_mst_atomic_payload *payload;
    int i, ret;
 
+   static const char *const status[] = {
+           "None",
+           "Local",
+           "DFP",
+           "Remote",
+   };
+
    mutex_lock(&mgr->lock);
    if (mgr->mst_primary)
            drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -

4834,7 +4874,7 @@

Quoted 3 lines

void drm_dp_mst_dump_topology(struct seq_file *m,
seq_printf(m, "payload_mask: %x, max_payloads: %d, start_slot:
%u,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

pbn_div: %d\n",

Quoted 5 lines
               state->payload_mask, mgr->max_payloads,

state- start_slot,
state->pbn_div);

- seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | sink

name

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

\n");
+ seq_printf(m, "\n| idx | port | vcpi | slots | pbn | dsc | status |

sink

Quoted 81 lines
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines
Quoted 81 lines

name |\n");

Quoted 4 lines
    for (i = 0; i < mgr->max_payloads; i++) {
            list_for_each_entry(payload, &state->payloads, next) {
                    char name[14]; @@ -4843,7 +4883,7 @@

void drm_dp_mst_dump_topology(struct

seq_file *m,

Quoted 4 lines
                            continue;

                    fetch_monitor_name(mgr, payload->port,

name,

sizeof(name));

Quoted 1 line

- seq_printf(m, " %5d %6d %6d %02d - %02d %5d %5s

%19s\n",

Quoted 2 lines

+ seq_printf(m, " %5d %6d %6d %02d - %02d
+ %5d %5s

%8s %19s\n",

Quoted 4 lines
                               i,
                               payload->port->port_num,
                               payload->vcpi, @@ -4851,6

+4891,7 @@ void drm_dp_mst_dump_topology(struct

seq_file *m,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct

Quoted 16 lines
                               payload->vc_start_slot +
payload- time_slots - 1,
                               payload->pbn,
                               payload->dsc_enabled ? "Y" :

"N",

drivers/gpu/drm/display/drm_dp_mst_topology.c +2 -0
+
+ status[payload->payload_allocation_status],
                               (*name != 0) ? name : "Unknown");
            }
    }
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
index e3f176a093d2..5f73cdabe7a1 100644
@@ -557,12 +557,8 @@ static void intel_mst_disable_dp(struct

intel_atomic_state *state,

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 561

Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
-   struct drm_dp_mst_topology_state *old_mst_state =
-           drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 562

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_topology_state *new_mst_state =
 
 drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 566

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -2
-   const struct drm_dp_mst_atomic_payload *old_payload =
-           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_disable_dp(struct · line 564

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +0 -0
    struct drm_dp_mst_atomic_payload *new_payload =
            drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 10 lines
    struct drm_i915_private *i915 =

to_i915(connector->base.dev); @@
-572,8 +568,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,

    intel_hdcp_disable(intel_mst->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
-   drm_dp_remove_payload(&intel_dp->mst_mgr, new_mst_state,
-                         old_payload, new_payload);
+   drm_dp_remove_payload_part1(&intel_dp->mst_mgr,

new_mst_state,

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 11 lines

+new_payload);

intel_audio_codec_disable(encoder, old_crtc_state,
old_conn_state); } @@ -588,6 +583,14 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,

    struct intel_dp *intel_dp = &dig_port->dp;
    struct intel_connector *connector =
            to_intel_connector(old_conn_state->connector);
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -0
+   struct drm_dp_mst_topology_state *old_mst_state =
+
+ drm_atomic_get_old_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -0
+   struct drm_dp_mst_topology_state *new_mst_state =
+
+ drm_atomic_get_new_mst_topology_state(&state->base,

&intel_dp->mst_mgr);

Quoted 87 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

connector->port);

drivers/gpu/drm/i915/display/intel_dp_mst.c

Quoted 2 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,

connector->port);

Quoted 1 line
    struct drm_i915_private *dev_priv = to_i915(connector-

base.dev);

Quoted 79 lines
Quoted 79 lines
Quoted 79 lines
Quoted 79 lines

drivers/gpu/drm/i915/display/intel_dp_mst.c static void · line 615

Quoted 8 lines
    bool last_mst_stream;
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -0
@@ -608,6 +611,9 @@ static void
 intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
    wait_for_act_sent(encoder, old_crtc_state);
 
+   drm_dp_remove_payload_part2(&intel_dp->mst_mgr,

new_mst_state,

Quoted 32 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +2 -0
+                               old_payload, new_payload);
+
    intel_ddi_disable_transcoder_func(old_crtc_state);
 
    if (DISPLAY_VER(dev_priv) >= 9) diff --git

a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 4e7c9c353c51..bba01fa0780c 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c +9 -3
@@ -882,21 +882,26 @@ struct nouveau_encoder
 *nv50_real_outp(struct drm_encoder *encoder)
 
 static void
 nv50_msto_cleanup(struct drm_atomic_state *state,
-             struct drm_dp_mst_topology_state *mst_state,
+             struct drm_dp_mst_topology_state
+ *new_mst_state,
              struct drm_dp_mst_topology_mgr *mgr,
              struct nv50_msto *msto)  {
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
-   struct drm_dp_mst_atomic_payload *payload =
-           drm_atomic_get_mst_payload_state(mst_state, msto->mstc-
 port);
+   struct drm_dp_mst_atomic_payload *new_payload =
+           drm_atomic_get_mst_payload_state(new_mst_state,
+ msto-
 mstc->port);
+   struct drm_dp_mst_topology_state *old_mst_state =
+           drm_atomic_get_old_mst_topology_state(state, mgr);
+   const struct drm_dp_mst_atomic_payload *old_payload =
+           drm_atomic_get_mst_payload_state(old_mst_state,

drivers/gpu/drm/nouveau/dispnv50/disp.c struct nouveau_encoder

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +2 -0
+ msto-
 mstc->port);
 
    NV_ATOMIC(drm, "%s: msto cleanup\n",
 msto->encoder.name);
 
    if (msto->disabled) {
            msto->mstc = NULL;
            msto->disabled = false;
+           drm_dp_remove_payload_part2(mgr, new_mst_state,

old_payload,

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
+new_payload);
    } else if (msto->enabled) {
-           drm_dp_add_payload_part2(mgr, state, payload);
+           drm_dp_add_payload_part2(mgr, state,
+ new_payload);
            msto->enabled = false;
    }
 }
@@ -910,19 +915,15 @@ nv50_msto_prepare(struct

drm_atomic_state

*state,

Quoted 11 lines
    struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
    struct nv50_mstc *mstc = msto->mstc;
    struct nv50_mstm *mstm = mstc->mstm;
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -2
-   struct drm_dp_mst_topology_state *old_mst_state;
-   struct drm_dp_mst_atomic_payload *payload, *old_payload;
+   struct drm_dp_mst_atomic_payload *payload;
 
    NV_ATOMIC(drm, "%s: msto prepare\n",

msto->encoder.name);

- old_mst_state = drm_atomic_get_old_mst_topology_state(state,

mgr);

Quoted 4 lines

-
payload = drm_atomic_get_mst_payload_state(mst_state,
mstc- port);
- old_payload =

drm_atomic_get_mst_payload_state(old_mst_state,

Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Quoted 11 lines
Quoted 11 lines

mstc->port);

Quoted 3 lines
    // TODO: Figure out if we want to do a better job of

handling VCPI

allocation failures here?

Quoted 2 lines
    if (msto->disabled) {

- drm_dp_remove_payload(mgr, mst_state, old_payload,

payload);

Quoted 3 lines

+ drm_dp_remove_payload_part1(mgr, mst_state,
+ payload);

Quoted 10 lines
Quoted 10 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_topology_ref_history { · line 46

Quoted 10 lines
            nvif_outp_dp_mst_vcpi(&mstm->outp->outp,
msto->head- base.index, 0, 0, 0, 0);
    } else {
include/drm/display/drm_dp_mst_helper.h +0 -0
index ed5c9660563c..4429d3b1745b 100644
@@ -46,6 +46,13 @@ struct drm_dp_mst_topology_ref_history {
 }; #endif /*

IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) */

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
include/drm/display/drm_dp_mst_helper.h +7 -0
+enum drm_dp_mst_payload_allocation {
+   DRM_DP_MST_PAYLOAD_ALLOCATION_NONE,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_DFP,
+   DRM_DP_MST_PAYLOAD_ALLOCATION_REMOTE,
+};
+
 struct drm_dp_mst_branch;
 
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 544

Quoted 3 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
 /**
@@ -537,7 +544,7 @@ struct drm_dp_mst_atomic_payload {
     *   drm_dp_mst_atomic_wait_for_dependencies() has been

called,

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

which will ensure the

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   previous MST states payload start slots have been copied over

to

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

the new state. Note

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -0
     *   that a new start slot won't be assigned/removed from this

payload

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

until

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +0 -1
-    *   drm_dp_add_payload_part1()/drm_dp_remove_payload()

have

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

been called.

Quoted 1 line
include/drm/display/drm_dp_mst_helper.h +1 -0
+    *

drm_dp_add_payload_part1()/drm_dp_remove_payload_part2()

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

have been called.

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
     * * Acquire the MST modesetting lock, and then wait for

any pending

MST-related commits to

Quoted 1 line

* get committed to hardware by calling drm_crtc_commit_wait()

on

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

each of the

Quoted 1 line

* &drm_crtc_commit structs in

&drm_dp_mst_topology_state.commit_deps.

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 571

Quoted 2 lines
include/drm/display/drm_dp_mst_helper.h +0 -0
@@ -564,6 +571,9 @@ struct drm_dp_mst_atomic_payload {
    /** @dsc_enabled: Whether or not this payload has DSC enabled

*/

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
Quoted 5 lines
Quoted 5 lines

include/drm/display/drm_dp_mst_helper.h struct drm_dp_mst_atomic_payload { · line 575

Quoted 4 lines
include/drm/display/drm_dp_mst_helper.h +2 -0
    bool dsc_enabled : 1;
 
+   /** @payload_allocation_status: The allocation status of
+ this payload

*/

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/drm/display/drm_dp_mst_helper.h +3 -0
+   enum drm_dp_mst_payload_allocation
+ payload_allocation_status;
+
    /** @next: The list node for this payload */
    struct list_head next;
 };
@@ -842,10 +852,13 @@ int drm_dp_add_payload_part1(struct

drm_dp_mst_topology_mgr *mgr, int

drm_dp_add_payload_part2(struct

Quoted 4 lines
Quoted 4 lines

drm_dp_mst_topology_mgr *mgr,

Quoted 3 lines

struct drm_atomic_state *state, struct drm_dp_mst_atomic_payload
*payload); -

Quoted 8 lines
Quoted 8 lines

void

include/drm/display/drm_dp_mst_helper.h

Quoted 3 lines

drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,

include/drm/display/drm_dp_mst_helper.h +0 -2
-                      struct drm_dp_mst_topology_state *mst_state,
-                      const struct drm_dp_mst_atomic_payload

*old_payload,

Quoted 1 line

- struct drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line

+void drm_dp_remove_payload_part1(struct

drm_dp_mst_topology_mgr

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

*mgr,

Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*payload); void

Quoted 1 line

+drm_dp_remove_payload_part2(struct

drm_dp_mst_topology_mgr

Quoted 37 lines
Quoted 23 lines
Quoted 23 lines

*mgr,

Quoted 21 lines
Quoted 10 lines
Quoted 2 lines

+ struct
+ drm_dp_mst_topology_state

*mst_state,

Quoted 2 lines

+ const struct
+ drm_dp_mst_atomic_payload

*old_payload,

Quoted 2 lines

+ struct
+ drm_dp_mst_atomic_payload

*new_payload);

Quoted 1 line
Quoted 8 lines
Quoted 3 lines

int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr
*mgr);

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

Quoted 8 lines
Quoted 4 lines

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

--
Regards,
Wayne

--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat

author
#13 lore raw

PATCH v2 3/3 drm/mst: adjust the function drm_dp_remove_payload_part2()

In reply to Wayne Lin

[Why]
Now in drm_dp_remove_payload_part2(), it utilizes the time slot number of the payload in old state to represent the one in the payload table at the moment.

It would be better to clarify the idea by using the latest allocated time slot number for the port at the moment instead and which info is already included in new mst_state. By this, we can also remove redundant workaround for amdgpu driver.

[How]
Remove "old_payload" input of drm_dp_remove_payload_part2() and get the latest number of allocated time slot for the port from new mst_state instead.

---
 .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 70 ++++---------------
 drivers/gpu/drm/display/drm_dp_mst_topology.c | 32 ++++++---
 drivers/gpu/drm/i915/display/intel_dp_mst.c   |  7 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c       |  6 +-
 include/drm/display/drm_dp_mst_helper.h       |  9 ++-
 5 files changed, 40 insertions(+), 84 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +13 -57
index 9ad509279b0a..e852da686c26 100644
@@ -203,40 +203,6 @@ void dm_helpers_dp_update_branch_info(
 	const struct dc_link *link)
 {}
 
-static void dm_helpers_construct_old_payload(
-			struct dc_link *link,
-			int pbn_per_slot,
-			struct drm_dp_mst_atomic_payload *new_payload,
-			struct drm_dp_mst_atomic_payload *old_payload)
-{
-	struct link_mst_stream_allocation_table current_link_table =
-									link->mst_stream_alloc_table;
-	struct link_mst_stream_allocation *dc_alloc;
-	int i;
-
-	*old_payload = *new_payload;
-
-	/* Set correct time_slots/PBN of old payload.
-	 * other fields (delete & dsc_enabled) in
-	 * struct drm_dp_mst_atomic_payload are don't care fields
-	 * while calling drm_dp_remove_payload_part2()
-	 */
-	for (i = 0; i < current_link_table.stream_count; i++) {
-		dc_alloc =
-			&current_link_table.stream_allocations[i];
-
-		if (dc_alloc->vcp_id == new_payload->vcpi) {
-			old_payload->time_slots = dc_alloc->slot_count;
-			old_payload->pbn = dc_alloc->slot_count * pbn_per_slot;
-			break;
-		}
-	}
-
-	/* make sure there is an old payload*/
-	ASSERT(i != current_link_table.stream_count);
-
-}
-
 /*
  * Writes payload allocation table in immediate downstream device.
  */
@@ -248,7 +214,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 {
 	struct amdgpu_dm_connector *aconnector;
 	struct drm_dp_mst_topology_state *mst_state;
-	struct drm_dp_mst_atomic_payload *target_payload, *new_payload, old_payload;
+	struct drm_dp_mst_atomic_payload *payload;
 	struct drm_dp_mst_topology_mgr *mst_mgr;
 
 	aconnector = (struct amdgpu_dm_connector *)stream->dm_stream_context;
@@ -262,27 +228,20 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
 
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
-	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
-
-	if (enable) {
-		target_payload = new_payload;
+	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
+	if (enable)
 		/* It's OK for this to fail */
-		drm_dp_add_payload_part1(mst_mgr, mst_state, new_payload);
-	} else {
-		/* construct old payload by VCPI*/
-		dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
-						new_payload, &old_payload);
-		target_payload = &old_payload;
+		drm_dp_add_payload_part1(mst_mgr, mst_state, payload);
+	else
 
-		drm_dp_remove_payload_part1(mst_mgr, mst_state, new_payload);
-	}
+		drm_dp_remove_payload_part1(mst_mgr, mst_state, payload);
 
 	/* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
 	 * AUX message. The sequence is slot 1-63 allocated sequence for each
 	 * stream. AMD ASIC stream slot allocation should follow the same
 	 * sequence. copy DRM MST allocation to dc */
-	fill_dc_mst_payload_table_from_drm(stream->link, enable, target_payload, proposed_table);
+	fill_dc_mst_payload_table_from_drm(stream->link, enable, payload, proposed_table);
 
 	return true;
 }
@@ -341,7 +300,7 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	struct amdgpu_dm_connector *aconnector;
 	struct drm_dp_mst_topology_state *mst_state;
 	struct drm_dp_mst_topology_mgr *mst_mgr;
-	struct drm_dp_mst_atomic_payload *new_payload, *old_payload;
+	struct drm_dp_mst_atomic_payload *payload;
 	enum mst_progress_status set_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	enum mst_progress_status clr_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 	int ret = 0;
@@ -354,20 +313,17 @@ bool dm_helpers_dp_mst_send_payload_allocation(
 	mst_mgr = &aconnector->mst_root->mst_mgr;
 	mst_state = to_drm_dp_mst_topology_state(mst_mgr->base.state);
 
-	new_payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
+	payload = drm_atomic_get_mst_payload_state(mst_state, aconnector->mst_output_port);
 
 	if (!enable) {
 		set_flag = MST_CLEAR_ALLOCATED_PAYLOAD;
 		clr_flag = MST_ALLOCATE_NEW_PAYLOAD;
 	}
 
-	if (enable) {
-		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, new_payload);
-	} else {
-		dm_helpers_construct_old_payload(stream->link, mst_state->pbn_div,
-						 new_payload, old_payload);
-		drm_dp_remove_payload_part2(mst_mgr, mst_state, old_payload, new_payload);
-	}
+	if (enable)
+		ret = drm_dp_add_payload_part2(mst_mgr, mst_state->base.state, payload);
+	else
+		drm_dp_remove_payload_part2(mst_mgr, mst_state, payload);
 
 	if (ret) {
 		amdgpu_dm_set_mst_status(&aconnector->mst_status,
drivers/gpu/drm/display/drm_dp_mst_topology.c +21 -11
index e04f87ff755a..4270178f95f6 100644
@@ -3382,8 +3382,7 @@ EXPORT_SYMBOL(drm_dp_remove_payload_part1);
  * drm_dp_remove_payload_part2() - Remove an MST payload locally
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @old_payload: The payload with its old state
- * @new_payload: The payload with its latest state
+ * @payload: The payload with its latest state
  *
  * Updates the starting time slots of all other payloads which would have been shifted towards
  * the start of the payload ID table as a result of removing a payload. Driver should call this
@@ -3392,25 +3391,36 @@ EXPORT_SYMBOL(drm_dp_remove_payload_part1);
  */
 void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 				 struct drm_dp_mst_topology_state *mst_state,
-				 const struct drm_dp_mst_atomic_payload *old_payload,
-				 struct drm_dp_mst_atomic_payload *new_payload)
+				 struct drm_dp_mst_atomic_payload *payload)
 {
 	struct drm_dp_mst_atomic_payload *pos;
+	u8 time_slots_to_remove;
+	u8 next_payload_vc_start = mgr->next_start_slot;
+
+	/* Find the current allocated time slot number of the payload */
+	list_for_each_entry(pos, &mst_state->payloads, next) {
+		if (pos != payload &&
+		    pos->vc_start_slot > payload->vc_start_slot &&
+		    pos->vc_start_slot < next_payload_vc_start)
+			next_payload_vc_start = pos->vc_start_slot;
+	}
+
+	time_slots_to_remove = next_payload_vc_start - payload->vc_start_slot;
 
 	/* Remove local payload allocation */
 	list_for_each_entry(pos, &mst_state->payloads, next) {
-		if (pos != new_payload && pos->vc_start_slot > new_payload->vc_start_slot)
-			pos->vc_start_slot -= old_payload->time_slots;
+		if (pos != payload && pos->vc_start_slot > payload->vc_start_slot)
+			pos->vc_start_slot -= time_slots_to_remove;
 	}
-	new_payload->vc_start_slot = -1;
+	payload->vc_start_slot = -1;
 
 	mgr->payload_count--;
-	mgr->next_start_slot -= old_payload->time_slots;
+	mgr->next_start_slot -= time_slots_to_remove;
 
-	if (new_payload->delete)
-		drm_dp_mst_put_port_malloc(new_payload->port);
+	if (payload->delete)
+		drm_dp_mst_put_port_malloc(payload->port);
 
-	new_payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
+	payload->payload_allocation_status = DRM_DP_MST_PAYLOAD_ALLOCATION_NONE;
 }
 EXPORT_SYMBOL(drm_dp_remove_payload_part2);
 /**
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -6
index 5f73cdabe7a1..91750c1dfc48 100644
@@ -583,12 +583,8 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 	struct intel_dp *intel_dp = &dig_port->dp;
 	struct intel_connector *connector =
 		to_intel_connector(old_conn_state->connector);
-	struct drm_dp_mst_topology_state *old_mst_state =
-		drm_atomic_get_old_mst_topology_state(&state->base, &intel_dp->mst_mgr);
 	struct drm_dp_mst_topology_state *new_mst_state =
 		drm_atomic_get_new_mst_topology_state(&state->base, &intel_dp->mst_mgr);
-	const struct drm_dp_mst_atomic_payload *old_payload =
-		drm_atomic_get_mst_payload_state(old_mst_state, connector->port);
 	struct drm_dp_mst_atomic_payload *new_payload =
 		drm_atomic_get_mst_payload_state(new_mst_state, connector->port);
 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
@@ -611,8 +607,7 @@ static void intel_mst_post_disable_dp(struct intel_atomic_state *state,
 
 	wait_for_act_sent(encoder, old_crtc_state);
 
-	drm_dp_remove_payload_part2(&intel_dp->mst_mgr, new_mst_state,
-				    old_payload, new_payload);
+	drm_dp_remove_payload_part2(&intel_dp->mst_mgr, new_mst_state, new_payload);
 
 	intel_ddi_disable_transcoder_func(old_crtc_state);
 
drivers/gpu/drm/nouveau/dispnv50/disp.c +1 -5
index bba01fa0780c..0d4286d0d872 100644
@@ -889,17 +889,13 @@ nv50_msto_cleanup(struct drm_atomic_state *state,
 	struct nouveau_drm *drm = nouveau_drm(msto->encoder.dev);
 	struct drm_dp_mst_atomic_payload *new_payload =
 		drm_atomic_get_mst_payload_state(new_mst_state, msto->mstc->port);
-	struct drm_dp_mst_topology_state *old_mst_state =
-		drm_atomic_get_old_mst_topology_state(state, mgr);
-	const struct drm_dp_mst_atomic_payload *old_payload =
-		drm_atomic_get_mst_payload_state(old_mst_state, msto->mstc->port);
 
 	NV_ATOMIC(drm, "%s: msto cleanup\n", msto->encoder.name);
 
 	if (msto->disabled) {
 		msto->mstc = NULL;
 		msto->disabled = false;
-		drm_dp_remove_payload_part2(mgr, new_mst_state, old_payload, new_payload);
+		drm_dp_remove_payload_part2(mgr, new_mst_state, new_payload);
 	} else if (msto->enabled) {
 		drm_dp_add_payload_part2(mgr, state, new_payload);
 		msto->enabled = false;
include/drm/display/drm_dp_mst_helper.h +4 -5
index 4429d3b1745b..3f8ad28c77b1 100644
@@ -853,12 +853,11 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
 			     struct drm_atomic_state *state,
 			     struct drm_dp_mst_atomic_payload *payload);
 void drm_dp_remove_payload_part1(struct drm_dp_mst_topology_mgr *mgr,
-				 struct drm_dp_mst_topology_state *mst_state,
-				 struct drm_dp_mst_atomic_payload *payload);
+				  struct drm_dp_mst_topology_state *mst_state,
+				  struct drm_dp_mst_atomic_payload *payload);
 void drm_dp_remove_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
-				 struct drm_dp_mst_topology_state *mst_state,
-				 const struct drm_dp_mst_atomic_payload *old_payload,
-				 struct drm_dp_mst_atomic_payload *new_payload);
+				  struct drm_dp_mst_topology_state *mst_state,
+				  struct drm_dp_mst_atomic_payload *payload);
 
 int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
 
Signature · 1 line
2.37.3