projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ae494e
)
drm/nv50/disp: wait for encoder disconnect to complete before link training
author
Ben Skeggs
<bskeggs@redhat.com>
Sun, 16 Oct 2011 22:56:09 +0000
(08:56 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Wed, 21 Dec 2011 09:01:20 +0000
(19:01 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_sor.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_sor.c
b/drivers/gpu/drm/nouveau/nv50_sor.c
index
3fab98a
..
48c09f5
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