* [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-15 1:39 Lyude Paul
[not found] ` <20181115013954.587-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2018-11-17 6:05 ` Sasha Levin
0 siblings, 2 replies; 8+ messages in thread
From: Lyude Paul @ 2018-11-15 1:39 UTC (permalink / raw)
To: nouveau
Cc: stable, Ben Skeggs, David Airlie, Daniel Vetter,
Ville Syrjälä,
Sean Paul, Ilia Mirkin, dri-devel, linux-kernel
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@redhat.com>
Cc: stable@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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
[not found] ` <20181115013954.587-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2018-11-15 18:05 ` Sasha Levin
0 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2018-11-15 18:05 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Ben Skeggs, stable-u79uwXL29TY76Z2rM5mHXA
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
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
[not found] ` <20181115013954.587-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2018-11-17 6:05 ` Sasha Levin
0 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2018-11-17 6:05 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau; +Cc: stable, Ben Skeggs, , stable, stable
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-17 6:05 ` Sasha Levin
0 siblings, 0 replies; 8+ messages in thread
From: Sasha Levin @ 2018-11-17 6:05 UTC (permalink / raw)
To: Sasha Levin, Lyude Paul, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Ben Skeggs, stable-u79uwXL29TY76Z2rM5mHXA
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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Nouveau] [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-24 15:36 ` Karol Herbst
0 siblings, 0 replies; 8+ messages in thread
From: Karol Herbst @ 2018-11-24 15:36 UTC (permalink / raw)
To: sashal; +Cc: Lyude Paul, nouveau, Ben Skeggs, stable
patch is Reviewed-by: Karol Herbst <kherbst@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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-24 15:36 ` Karol Herbst
0 siblings, 0 replies; 8+ messages in thread
From: Karol Herbst @ 2018-11-24 15:36 UTC (permalink / raw)
To: sashal-DgEjT+Ai2ygdnm+yROfE0A
Cc: nouveau, Ben Skeggs, stable-u79uwXL29TY76Z2rM5mHXA
patch is Reviewed-by: Karol Herbst <kherbst@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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Nouveau] [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-24 15:36 ` Karol Herbst
0 siblings, 0 replies; 8+ messages in thread
From: Karol Herbst @ 2018-11-24 15:36 UTC (permalink / raw)
To: sashal; +Cc: Lyude Paul, nouveau, Ben Skeggs, stable
mhh, for 4.14.81 I don't know. there should be mstm support, maybe it
just needs an adjusted patch. Lyude?
On Sat, Nov 24, 2018 at 4:36 PM Karol Herbst <kherbst@redhat.com> wrote:
>
> patch is Reviewed-by: Karol Herbst <kherbst@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@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@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume()
@ 2018-11-24 15:36 ` Karol Herbst
0 siblings, 0 replies; 8+ messages in thread
From: Karol Herbst @ 2018-11-24 15:36 UTC (permalink / raw)
To: sashal-DgEjT+Ai2ygdnm+yROfE0A
Cc: nouveau, Ben Skeggs, stable-u79uwXL29TY76Z2rM5mHXA
mhh, for 4.14.81 I don't know. there should be mstm support, maybe it
just needs an adjusted patch. Lyude?
On Sat, Nov 24, 2018 at 4:36 PM Karol Herbst <kherbst@redhat.com> wrote:
>
> patch is Reviewed-by: Karol Herbst <kherbst@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@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@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-11-24 15:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-15 1:39 [PATCH] drm/nouveau: Check rc from drm_dp_mst_topology_mgr_resume() Lyude Paul
[not found] ` <20181115013954.587-1-lyude-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2018-11-15 18:05 ` Sasha Levin
2018-11-17 6:05 ` Sasha Levin
2018-11-17 6:05 ` Sasha Levin
2018-11-24 15:36 ` [Nouveau] " Karol Herbst
2018-11-24 15:36 ` Karol Herbst
2018-11-24 15:36 ` [Nouveau] " Karol Herbst
2018-11-24 15:36 ` Karol Herbst
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.