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:43:00 +1000 |
| commit | c8f28f89566321842afb81d3ddd79d611e3587ce (patch) | |
| tree | 7feab3b5ce9277ee8ca9779281dbf59732ec7e8c /drivers/gpu/drm | |
| parent | drm/nv50: encoder creation failure doesn't mean full init failure (diff) | |
| download | linux-dev-c8f28f89566321842afb81d3ddd79d611e3587ce.tar.xz linux-dev-c8f28f89566321842afb81d3ddd79d611e3587ce.zip | |
drm/nouveau: 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 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c index 5fa13267bd9f..02e369f80449 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/core/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 |