diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-03-05 14:59:26 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-03-11 08:40:37 +1000 |
| commit | a1605467b659da1ae22e9867551b5514531884f0 (patch) | |
| tree | 524429bf5a9449a9133a397630da61b8fcb5775d /nvkm/engine/disp/nv50.c | |
| parent | b5a3abd115c14df4d1a2f2f76439d6e4961b6e26 (diff) | |
| download | nouveau-a1605467b659da1ae22e9867551b5514531884f0.tar.gz | |
kms: fix regression in vblanking
nv50_vblank_enable/disable got switched from NV50_PDISPLAY_INTR_EN_1_VBLANK_CRTC_0 (4) << head to 1 << head, which is wrong.
4 << head is the correct value.
Fixes regression with vblanking since 1d7c71a3e2f77 "drm/nouveau/disp: port vblank handling to event interface"
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/engine/disp/nv50.c')
| -rw-r--r-- | nvkm/engine/disp/nv50.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nvkm/engine/disp/nv50.c b/nvkm/engine/disp/nv50.c index 5fa13267b..02e369f80 100644 --- a/nvkm/engine/disp/nv50.c +++ b/nvkm/engine/disp/nv50.c @@ -544,13 +544,13 @@ nv50_disp_curs_ofuncs = { static void nv50_disp_base_vblank_enable(struct nouveau_event *event, int head) { - nv_mask(event->priv, 0x61002c, (1 << head), (1 << head)); + nv_mask(event->priv, 0x61002c, (4 << head), (4 << head)); } static void nv50_disp_base_vblank_disable(struct nouveau_event *event, int head) { - nv_mask(event->priv, 0x61002c, (1 << head), (0 << head)); + nv_mask(event->priv, 0x61002c, (4 << head), 0); } static int |