Refactor and clean up codes of mst
Subsystems (7)
v3 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]>
Changes since v2:
* Fix indention
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
PATCH v3 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
@@ -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
PATCH v3 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]>
Changes since v2:
* Fix indention
--- .../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
@@ -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 =
@@ -263,13 +263,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*/
@@ -277,7 +276,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
@@ -344,7 +343,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 ;
@@ -357,15 +356,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
@@ -565,12 +565,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);
@@ -580,8 +576,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); }
@@ -596,6 +591,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;
@@ -616,6 +619,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
@@ -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
@@ -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
PATCH v3 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
@@ -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 = - ¤t_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;
@@ -263,28 +229,21 @@ 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; }
@@ -343,7 +302,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 ;
@@ -356,20 +315,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
@@ -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
@@ -591,12 +591,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);
@@ -619,8 +615,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
@@ -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
@@ -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