Skip to contentSkip to conversation

drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable

PATCH Superseded Chuhong Yuan 3 participants 3 messages Dec 6, 2019 – Dec 12, 2019

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/dp_mst: add missed nv50_outp_release in nv50_msto_disable

nv50_msto_disable() does not call nv50_outp_release() to match nv50_outp_acquire() like other disable().
Add the missed call to fix it.

---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
index 549486f1d937..84e1417355cc 100644
@@ -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;
 }
 
Signature · 6 lines
2.24.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
#1 lore raw
Quoted 3 lines · 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.

The subject prefix "drm/dp_mst" implies drm core change, but this is about nouveau. Please fix.

BR,
Jani.

Quoted 21 lines
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
index 549486f1d937..84e1417355cc 100644
@@ -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;
 }
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#2 lore raw
Quoted 5 lines · Jani Nikula
Quoted 3 lines · 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.

This is intentional, and it's called at a later time (nv50_mstm_prepare()) to avoid confusing HW.

Ben.

Quoted 35 lines

The subject prefix "drm/dp_mst" implies drm core change, but this is about nouveau. Please fix.

BR,
Jani.

Quoted 11 lines
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/disp.c +0 -0
index 549486f1d937..84e1417355cc 100644

drivers/gpu/drm/nouveau/dispnv50/disp.c nv50_msto_disable(struct drm_encoder *encoder) · line 870

Quoted 10 lines
drivers/gpu/drm/nouveau/dispnv50/disp.c +3 -1
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel