| Message ID | 20181117002120.28703-5-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove all bad dp_mst_port uses and hide struct def | expand |
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
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);
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(-)