Nouveau - Nov 2018 - [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()

We need to actually make sure we check this on resume since otherwise we
won't know whether or not the topology is still there once we've
resumed, which will cause us to still think the topology is connected
even after it's been removed if the removal happens mid-suspend.

Signed-off-by: Lyude Paul <lyude at redhat.com>
Cc: stable at vger.kernel.org
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 6cbbae3f438b..6aa3521b6326 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1255,8 +1255,16 @@ nv50_mstm_fini(struct nv50_mstm *mstm)
 static void
 nv50_mstm_init(struct nv50_mstm *mstm)
 {
-	if (mstm && mstm->mgr.mst_state)
-		drm_dp_mst_topology_mgr_resume(&mstm->mgr);
+	int ret;
+
+	if (!mstm || !mstm->mgr.mst_state)
+		return;
+
+	ret = drm_dp_mst_topology_mgr_resume(&mstm->mgr);
+	if (ret == -1) {
+		drm_dp_mst_topology_mgr_set_mst(&mstm->mgr, false);
+		drm_kms_helper_hotplug_event(mstm->mgr.dev);
+	}
 }
 
 static void
-- 
2.19.1

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v4.19.2, v4.18.19, v4.14.81, v4.9.137,
v4.4.163, v3.18.125.

v4.19.2: Build OK!
v4.18.19: Build OK!
v4.14.81: Failed to apply! Possible dependencies:
    Unable to calculate

v4.9.137: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")

v4.4.163: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")

v3.18.125: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")


--
Thanks,
Sasha

Hi,

[This is an automated email]

This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all

The bot has tested the following trees: v4.19.2, v4.18.19, v4.14.81, v4.9.137,
v4.4.163, v3.18.125.

v4.19.2: Build OK!
v4.18.19: Build OK!
v4.14.81: Failed to apply! Possible dependencies:
    Unable to calculate

v4.9.137: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")

v4.4.163: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")

v3.18.125: Failed to apply! Possible dependencies:
    f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")


How should we proceed with this patch?

--
Thanks,
Sasha

patch is Reviewed-by: Karol Herbst <kherbst at redhat.com>

@Sasha: I think we can ignore this patch for those older kernels as
there is no mstm support to begin with inside Nouveau meaning you
wouldn't run into that issue.
On Sat, Nov 24, 2018 at 5:00 AM Sasha Levin <sashal at kernel.org>
wrote:
>
> Hi,
>
> [This is an automated email]
>
> This commit has been processed because it contains a -stable tag.
> The stable tag indicates that it's relevant for the following trees:
all
>
> The bot has tested the following trees: v4.19.2, v4.18.19, v4.14.81,
v4.9.137, v4.4.163, v3.18.125.
>
> v4.19.2: Build OK!
> v4.18.19: Build OK!
> v4.14.81: Failed to apply! Possible dependencies:
>     Unable to calculate
>
> v4.9.137: Failed to apply! Possible dependencies:
>     f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")
>
> v4.4.163: Failed to apply! Possible dependencies:
>     f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")
>
> v3.18.125: Failed to apply! Possible dependencies:
>     f479c0ba4a17 ("drm/nouveau/kms/nv50: initial support for DP 1.2
multi-stream")
>
>
> How should we proceed with this patch?
>
> --
> Thanks,
> Sasha
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau