[Nouveau] [PATCH v2 30/44] drm/nouveau/kms/nv50-: flush mst disables together

[Ben Skeggs]

From: Ben Skeggs <bske...@redhat.com>

- fixes some issues tearing down modes on tiled displays

Signed-off-by: Ben Skeggs <bske...@redhat.com>
Reviewed-by: Lyude Paul <ly...@redhat.com>
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 11 +----------
 drivers/gpu/drm/nouveau/dispnv50/disp.h |  1 -
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c 
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b7e9f951eee3..d52320965b50 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2086,13 +2086,6 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state 
*state)
                        help->atomic_disable(encoder, state);
                        outp->disabled = true;
                        interlock[NV50_DISP_INTERLOCK_CORE] |= 1;
-                       if (outp->flush_disable) {
-                               nv50_disp_atomic_commit_wndw(state, interlock);
-                               nv50_disp_atomic_commit_core(state, interlock);
-                               memset(interlock, 0x00, sizeof(interlock));
-
-                               flushed = true;
-                       }
                }
        }
 
@@ -2378,10 +2371,8 @@ nv50_disp_outp_atomic_check_clr(struct nv50_atom *atom,
                        return PTR_ERR(outp);
 
                if (outp->encoder->encoder_type == DRM_MODE_ENCODER_DPMST ||
-                   nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP) 
{
-                       outp->flush_disable = true;
+                   nouveau_encoder(outp->encoder)->dcb->type == DCB_OUTPUT_DP)
                        atom->flush_disable = true;
-               }
                outp->clr.ctrl = true;
                atom->lock_core = true;
        }
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h 
b/drivers/gpu/drm/nouveau/dispnv50/disp.h
index 42209f5b06f9..1e5601223c75 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h
@@ -83,7 +83,6 @@ struct nv50_outp_atom {
        struct list_head head;
 
        struct drm_encoder *encoder;
-       bool flush_disable;
 
        bool disabled;
        bool enabled;
-- 
2.41.0