diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-10-24 14:15:58 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 15:11:16 +1000 |
| commit | 1f6d2de2c539df6fe52ad2187191a9dfe10c7233 (patch) | |
| tree | 29758c192b7e9dfef4c4f4793bc8c459d5cdb85f /drivers/gpu/drm/nouveau/nv50_graph.c | |
| parent | 1c180fa5bd5f264e4863bb88861e8cd7d135b917 (diff) | |
| download | op-kernel-dev-1f6d2de2c539df6fe52ad2187191a9dfe10c7233.zip op-kernel-dev-1f6d2de2c539df6fe52ad2187191a9dfe10c7233.tar.gz | |
drm/nv50: Keep track of the head a channel is vsync'ing to.
In a multihead setup vblank interrupts may end up enabled in both
heads. In that case we want to ignore the vblank interrupts coming
from the wrong CRTC to avoid tearing and unbalanced calls to
drm_vblank_get/put (fdo bug 31074).
Reported-by: Felix Leimbach <felix.leimbach@gmx.net>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_graph.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 6d81f4d..e0f5294 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c @@ -387,7 +387,10 @@ nv50_graph_nvsw_vblsem_release(struct nouveau_channel *chan, return -EINVAL; drm_vblank_get(dev, data); + + chan->nvsw.vblsem_head = data; list_add(&chan->nvsw.vbl_wait, &dev_priv->vbl_waiting); + return 0; } |
