* [PATCH] drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable
@ 2019-12-06 7:53 Chuhong Yuan
2019-12-12 8:14 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Chuhong Yuan @ 2019-12-06 7:53 UTC (permalink / raw)
Cc: Ben Skeggs, David Airlie, Daniel Vetter, dri-devel, nouveau,
linux-kernel, Chuhong Yuan
nv50_msto_disable() does not call nv50_outp_release() to match
nv50_outp_acquire() like other disable().
Add the missed call to fix it.
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 549486f1d937..84e1417355cc 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -862,8 +862,10 @@ nv50_msto_disable(struct drm_encoder *encoder)
mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);
mstm->modified = true;
- if (!--mstm->links)
+ if (!--mstm->links) {
mstm->disabled = true;
+ nv50_outp_release(mstm->outp);
+ }
msto->disabled = true;
}
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable
2019-12-06 7:53 [PATCH] drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable Chuhong Yuan
@ 2019-12-12 8:14 ` Jani Nikula
2019-12-12 23:39 ` Ben Skeggs
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2019-12-12 8:14 UTC (permalink / raw)
To: Chuhong Yuan
Cc: David Airlie, nouveau, Chuhong Yuan, linux-kernel, dri-devel, Ben Skeggs
On Fri, 06 Dec 2019, Chuhong Yuan <hslester96@gmail.com> wrote:
> nv50_msto_disable() does not call nv50_outp_release() to match
> nv50_outp_acquire() like other disable().
> Add the missed call to fix it.
The subject prefix "drm/dp_mst" implies drm core change, but this is
about nouveau. Please fix.
BR,
Jani.
>
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> ---
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 549486f1d937..84e1417355cc 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -862,8 +862,10 @@ nv50_msto_disable(struct drm_encoder *encoder)
>
> mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);
> mstm->modified = true;
> - if (!--mstm->links)
> + if (!--mstm->links) {
> mstm->disabled = true;
> + nv50_outp_release(mstm->outp);
> + }
> msto->disabled = true;
> }
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable
2019-12-12 8:14 ` Jani Nikula
@ 2019-12-12 23:39 ` Ben Skeggs
0 siblings, 0 replies; 3+ messages in thread
From: Ben Skeggs @ 2019-12-12 23:39 UTC (permalink / raw)
To: Jani Nikula
Cc: Chuhong Yuan, David Airlie, ML nouveau, LKML, ML dri-devel, Ben Skeggs
On Thu, 12 Dec 2019 at 18:14, Jani Nikula <jani.nikula@linux.intel.com> wrote:
>
> On Fri, 06 Dec 2019, Chuhong Yuan <hslester96@gmail.com> wrote:
> > nv50_msto_disable() does not call nv50_outp_release() to match
> > nv50_outp_acquire() like other disable().
> > Add the missed call to fix it.
This is intentional, and it's called at a later time
(nv50_mstm_prepare()) to avoid confusing HW.
Ben.
>
> The subject prefix "drm/dp_mst" implies drm core change, but this is
> about nouveau. Please fix.
>
> BR,
> Jani.
>
> >
> > Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> > ---
> > drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > index 549486f1d937..84e1417355cc 100644
> > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > @@ -862,8 +862,10 @@ nv50_msto_disable(struct drm_encoder *encoder)
> >
> > mstm->outp->update(mstm->outp, msto->head->base.index, NULL, 0, 0);
> > mstm->modified = true;
> > - if (!--mstm->links)
> > + if (!--mstm->links) {
> > mstm->disabled = true;
> > + nv50_outp_release(mstm->outp);
> > + }
> > msto->disabled = true;
> > }
>
> --
> Jani Nikula, Intel Open Source Graphics Center
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-12 23:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-06 7:53 [PATCH] drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable Chuhong Yuan
2019-12-12 8:14 ` Jani Nikula
2019-12-12 23:39 ` Ben Skeggs
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).