On Wed, Apr 05, 2023 at 02:37:05PM -0500, Mario Limonciello wrote:
> Hi,
>
> Some MST fixups that landed in 6.3-rc1 were CC to stable and successfully
> applied to 6.2.y, but failed to apply to 6.1.y even though they are needed
> there as well.
>
> They fail to apply due to this commit missing in 6.1.y:
> commit 8c7d980da9ba ("drm/nouveau/disp: move DP MST payload config method")
>
> Backporting that is a rabbit hole of other work and makes this no longer
> viable for stable, so instead hand modify
> commit e761cc20946a ("drm/display/dp_mst: Handle old/new payload states in drm_dp_remove_payload()")
>
> for the missing contextual changes in 6.1.y in nouveau.
>
> I've tested that these work on a Rembrandt laptop connected to WD19TB
> with two monitors connected.
>
> Imre Deak (2):
> drm/display/dp_mst: Handle old/new payload states in
> drm_dp_remove_payload()
> drm/i915/dp_mst: Fix payload removal during output disabling
>
> .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
> drivers/gpu/drm/display/drm_dp_mst_topology.c | 26 ++++++++++---------
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 14 +++++++---
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> include/drm/display/drm_dp_mst_helper.h | 3 ++-
> 5 files changed, 28 insertions(+), 19 deletions(-)
>
> --
> 2.34.1
>
Both now queued up, thanks.
greg k-h
