drm/display/dp_mst: Handle old/new payload states in drm_dp_remove_payload()

commit e761cc20946a0094df71cb31a565a6a0d03bd8be upstream.

Atm, drm_dp_remove_payload() uses the same payload state to both get the
vc_start_slot required for the payload removal DPCD message and to
deduct time_slots from vc_start_slot of all payloads after the one being
removed.

The above isn't always correct, as vc_start_slot must be the up-to-date
version contained in the new payload state, but time_slots must be the
one used when the payload was previously added, contained in the old
payload state. The new payload's time_slots can change vs. the old one
if the current atomic commit changes the corresponding mode.

This patch let's drivers pass the old and new payload states to
drm_dp_remove_payload(), but keeps these the same for now in all drivers
not to change the behavior. A follow-up i915 patch will pass in that
driver the correct old and new states to the function.

Cc: Lyude Paul <lyude@redhat.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Wayne Lin <Wayne.Lin@amd.com>
Cc: stable@vger.kernel.org # 6.1
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Acked-by: Lyude Paul <lyude@redhat.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230206114856.2665066-2-imre.deak@intel.com
Hand modified for missing 8c7d980da9ba3eb67a1b40fd4b33bcf49397084b
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
index 57454967617f873e2ac6661c69bf5cf5337df525..6bd7e45370141ed04d8c63bc1a51efff02d0e969 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
@@ -206,7 +206,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
        if (enable)
                drm_dp_add_payload_part1(mst_mgr, mst_state, payload);
        else
-               drm_dp_remove_payload(mst_mgr, mst_state, payload);
+               drm_dp_remove_payload(mst_mgr, mst_state, payload, 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

diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index e77c674b37ca2f5217767f328bbee3570acfc260..38dab76ae69ea6232062be9b431d52a57ed4015c 100644 (file)
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -3342,7 +3342,8 @@ EXPORT_SYMBOL(drm_dp_add_payload_part1);
  * drm_dp_remove_payload() - Remove an MST payload
  * @mgr: Manager to use.
  * @mst_state: The MST atomic state
- * @payload: The payload to write
+ * @old_payload: The payload with its old state
+ * @new_payload: The payload to write
  *
  * 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
@@ -3350,36 +3351,37 @@ EXPORT_SYMBOL(drm_dp_add_payload_part1);
  */
 void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
                           struct drm_dp_mst_topology_state *mst_state,
-                          struct drm_dp_mst_atomic_payload *payload)
+                          const struct drm_dp_mst_atomic_payload *old_payload,
+                          struct drm_dp_mst_atomic_payload *new_payload)
 {
        struct drm_dp_mst_atomic_payload *pos;
        bool send_remove = false;
 
        /* We failed to make the payload, so nothing to do */
-       if (payload->vc_start_slot == -1)
+       if (new_payload->vc_start_slot == -1)
                return;
 
        mutex_lock(&mgr->lock);
-       send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary);
+       send_remove = drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr->mst_primary);
        mutex_unlock(&mgr->lock);
 
        if (send_remove)
-               drm_dp_destroy_payload_step1(mgr, mst_state, payload);
+               drm_dp_destroy_payload_step1(mgr, mst_state, new_payload);
        else
                drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n",
-                           payload->vcpi);
+                           new_payload->vcpi);
 
        list_for_each_entry(pos, &mst_state->payloads, next) {
-               if (pos != payload && pos->vc_start_slot > payload->vc_start_slot)
-                       pos->vc_start_slot -= payload->time_slots;
+               if (pos != new_payload && pos->vc_start_slot > new_payload->vc_start_slot)
+                       pos->vc_start_slot -= old_payload->time_slots;
        }
-       payload->vc_start_slot = -1;
+       new_payload->vc_start_slot = -1;
 
        mgr->payload_count--;
-       mgr->next_start_slot -= payload->time_slots;
+       mgr->next_start_slot -= old_payload->time_slots;
 
-       if (payload->delete)
-               drm_dp_mst_put_port_malloc(payload->port);
+       if (new_payload->delete)
+               drm_dp_mst_put_port_malloc(new_payload->port);
 }
 EXPORT_SYMBOL(drm_dp_remove_payload);
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 27c2098dd7070e0742d18a87f0ce0eea3b4708db..256afff75b0a60d742fc1b5bd4b928d96d10163d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -366,6 +366,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
                to_intel_connector(old_conn_state->connector);
        struct drm_dp_mst_topology_state *mst_state =
                drm_atomic_get_mst_topology_state(&state->base, &intel_dp->mst_mgr);
+       struct drm_dp_mst_atomic_payload *payload =
+               drm_atomic_get_mst_payload_state(mst_state, connector->port);
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
 
        drm_dbg_kms(&i915->drm, "active links %d\n",
@@ -374,7 +376,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, mst_state,
-                             drm_atomic_get_mst_payload_state(mst_state, connector->port));
+                             payload, payload);
 
        intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
 }

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 452a9ce47b633ec402d2c6a0c2a14dc73af39f98..006cb76adaa935b84cf003b667801a0dbf33a54a 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1028,7 +1028,7 @@ nv50_msto_prepare(struct drm_atomic_state *state,
 
        // 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, payload);
+               drm_dp_remove_payload(mgr, mst_state, payload, payload);
        } else {
                if (msto->enabled)
                        drm_dp_add_payload_part1(mgr, mst_state, payload);

diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h
index 6c0c3dc3d3acac6dbbfcfb0c220cc0df2db15be5..32c764fb9cb563fb6c8ac526b845100b60ef7764 100644 (file)
--- a/include/drm/display/drm_dp_mst_helper.h
+++ b/include/drm/display/drm_dp_mst_helper.h
@@ -841,7 +841,8 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
                             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,
-                          struct drm_dp_mst_atomic_payload *payload);
+                          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);