* [PATCH 3/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_get_modes() [not found] <20181117002120.28703-1-lyude@redhat.com> @ 2018-11-17 0:21 ` Lyude Paul 2018-11-17 12:24 ` Sasha Levin 2018-11-17 0:21 ` [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() Lyude Paul 1 sibling, 1 reply; 5+ messages in thread From: Lyude Paul @ 2018-11-17 0:21 UTC (permalink / raw) To: dri-devel, intel-gfx, nouveau; +Cc: Lyude Paul, stable mstc->port isn't validated here so it could be null or worse when we access it. And drivers aren't ever supposed to be looking at it's contents anyway. Plus, we can already get the MST manager from &mstc->mstm->mgr. Signed-off-by: Lyude Paul <lyude@redhat.com> Cc: stable@vger.kernel.org --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index e6f72ca0b1fa..66c40b56a0cb 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -893,7 +893,8 @@ nv50_mstc_get_modes(struct drm_connector *connector) struct nv50_mstc *mstc = nv50_mstc(connector); int ret = 0; - mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port); + mstc->edid = drm_dp_mst_get_edid(&mstc->connector, + &mstc->mstm->mgr, mstc->port); drm_connector_update_edid_property(&mstc->connector, mstc->edid); if (mstc->edid) ret = drm_add_edid_modes(&mstc->connector, mstc->edid); -- 2.19.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_get_modes() 2018-11-17 0:21 ` [PATCH 3/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_get_modes() Lyude Paul @ 2018-11-17 12:24 ` Sasha Levin 0 siblings, 0 replies; 5+ messages in thread From: Sasha Levin @ 2018-11-17 12:24 UTC (permalink / raw) To: Sasha Levin, Lyude Paul, dri-devel, intel-gfx Cc: Lyude Paul, stable, 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: Failed to apply! Possible dependencies: Unable to calculate 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] 5+ messages in thread
* [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() [not found] <20181117002120.28703-1-lyude@redhat.com> 2018-11-17 0:21 ` [PATCH 3/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_get_modes() Lyude Paul @ 2018-11-17 0:21 ` Lyude Paul 2018-11-17 12:24 ` Sasha Levin 1 sibling, 1 reply; 5+ messages in thread From: Lyude Paul @ 2018-11-17 0:21 UTC (permalink / raw) To: dri-devel, intel-gfx, nouveau; +Cc: Lyude Paul, stable Same as the previous commit, but for nv50_mstc_detect() this time. Signed-off-by: Lyude Paul <lyude@redhat.com> Cc: stable@vger.kernel.org --- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 66c40b56a0cb..a08dd827e892 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -930,7 +930,7 @@ nv50_mstc_detect(struct drm_connector *connector, bool force) if (ret < 0 && ret != -EACCES) return connector_status_disconnected; - conn_status = drm_dp_mst_detect_port(connector, mstc->port->mgr, + conn_status = drm_dp_mst_detect_port(connector, &mstc->mstm->mgr, mstc->port); pm_runtime_mark_last_busy(connector->dev->dev); -- 2.19.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() 2018-11-17 0:21 ` [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() Lyude Paul @ 2018-11-17 12:24 ` Sasha Levin 2018-11-27 18:28 ` Lyude Paul 0 siblings, 1 reply; 5+ messages in thread From: Sasha Levin @ 2018-11-17 12:24 UTC (permalink / raw) To: Sasha Levin, Lyude Paul, dri-devel, intel-gfx Cc: Lyude Paul, stable, 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: e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()") v4.9.137: Failed to apply! Possible dependencies: e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()") v4.4.163: Failed to apply! Possible dependencies: e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()") v3.18.125: Failed to apply! Possible dependencies: e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()") How should we proceed with this patch? -- Thanks, Sasha ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() 2018-11-17 12:24 ` Sasha Levin @ 2018-11-27 18:28 ` Lyude Paul 0 siblings, 0 replies; 5+ messages in thread From: Lyude Paul @ 2018-11-27 18:28 UTC (permalink / raw) To: Sasha Levin, dri-devel, intel-gfx; +Cc: stable On Sat, 2018-11-17 at 12:24 +0000, Sasha Levin 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: > e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in > nv50_mstc_detect()") > > v4.9.137: Failed to apply! Possible dependencies: > e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in > nv50_mstc_detect()") > > v4.4.163: Failed to apply! Possible dependencies: > e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in > nv50_mstc_detect()") > > v3.18.125: Failed to apply! Possible dependencies: > e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in > nv50_mstc_detect()") > > > How should we proceed with this patch? e46368cf77f2 ("drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()") Should also be backported for v4.9+, and then this patch should be applied on top of that. > > -- > Thanks, > Sasha -- Cheers, Lyude Paul ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-27 18:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20181117002120.28703-1-lyude@redhat.com>
2018-11-17 0:21 ` [PATCH 3/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_get_modes() Lyude Paul
2018-11-17 12:24 ` Sasha Levin
2018-11-17 0:21 ` [PATCH 4/6] drm/nouveau: Stop reading port->mgr in nv50_mstc_detect() Lyude Paul
2018-11-17 12:24 ` Sasha Levin
2018-11-27 18:28 ` Lyude Paul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).