drm/nv50: supply encoder disable() hook for SOR outputs

Allows us to remove a driver hack that used to be necessary to disable
encoders in certain situations before setting up a mode.  The DRM has
better knowledge of when this is needed than the driver does.

This fixes a number of display switching issues.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 0 insertions, 31 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index b4e4a3b05ea..fb3ed5d80aa 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -440,40 +440,9 @@ nv50_crtc_prepare(struct drm_crtc *crtc)
 {
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         struct drm_device *dev = crtc->dev;
-        struct drm_encoder *encoder;
-        uint32_t dac = 0, sor = 0;
 
         NV_DEBUG_KMS(dev, "index %d\n", nv_crtc->index);
 
-        /* Disconnect all unused encoders. */
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-
-                if (!drm_helper_encoder_in_use(encoder))
-                        continue;
-
-                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
-                    nv_encoder->dcb->type == OUTPUT_TV)
-                        dac |= (1 << nv_encoder->or);
-                else
-                        sor |= (1 << nv_encoder->or);
-        }
-
-        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-
-                if (nv_encoder->dcb->type == OUTPUT_ANALOG ||
-                    nv_encoder->dcb->type == OUTPUT_TV) {
-                        if (dac & (1 << nv_encoder->or))
-                                continue;
-                } else {
-                        if (sor & (1 << nv_encoder->or))
-                                continue;
-                }
-
-                nv_encoder->disconnect(nv_encoder);
-        }
-
         nv50_crtc_blank(nv_crtc, true);
 }