diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-10-21 12:19:29 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:11:11 -0500 |
commit | 042206c0cd4924879c4292c5ffa2bf1e8023ae5a (patch) | |
tree | c775b823b4e3d598e4fc41023a96e2e4b3126c20 /drivers/gpu/drm/nouveau/nv50_graph.c | |
parent | 63f7fcfebd2ff1995b649101d6120b60fa0e5b06 (diff) |
drm/nouveau: Implement the vblank DRM hooks.
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 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index d441308a09cf..ac7f62d524bb 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c | |||
@@ -384,14 +384,7 @@ nv50_graph_nvsw_vblsem_release(struct nouveau_channel *chan, | |||
384 | if (!chan->nvsw.vblsem || chan->nvsw.vblsem_offset == ~0 || data > 1) | 384 | if (!chan->nvsw.vblsem || chan->nvsw.vblsem_offset == ~0 || data > 1) |
385 | return -EINVAL; | 385 | return -EINVAL; |
386 | 386 | ||
387 | if (!(nv_rd32(dev, NV50_PDISPLAY_INTR_EN_1) & | 387 | drm_vblank_get(dev, data); |
388 | NV50_PDISPLAY_INTR_EN_1_VBLANK_CRTC_(data))) { | ||
389 | nv_wr32(dev, NV50_PDISPLAY_INTR_1, | ||
390 | NV50_PDISPLAY_INTR_1_VBLANK_CRTC_(data)); | ||
391 | nv_mask(dev, NV50_PDISPLAY_INTR_EN_1, 0, | ||
392 | NV50_PDISPLAY_INTR_EN_1_VBLANK_CRTC_(data)); | ||
393 | } | ||
394 | |||
395 | list_add(&chan->nvsw.vbl_wait, &dev_priv->vbl_waiting); | 388 | list_add(&chan->nvsw.vbl_wait, &dev_priv->vbl_waiting); |
396 | return 0; | 389 | return 0; |
397 | } | 390 | } |