drm/nv50/disp: wait for encoder disconnect to complete before link training

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

diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index 3fab98a2f9592b6c40253026b632d6400090e3aa..48c09f5cd4fbfd114bbff98ea52dea0aa3cae4f5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -174,7 +174,12 @@ nv50_sor_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode,
 static void
 nv50_sor_prepare(struct drm_encoder *encoder)
 {
+       struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
        nv50_sor_disconnect(encoder);
+       if (nv_encoder->dcb->type == OUTPUT_DP) {
+               /* avoid race between link training and supervisor intr */
+               nv50_display_sync(encoder->dev);
+       }
 }
 
 static void