* [PATCH] drm/nouveau: fix regression in vblanking
@ 2013-03-05 13:59 Maarten Lankhorst
2013-03-05 18:08 ` Marcin Slusarz
0 siblings, 1 reply; 2+ messages in thread
From: Maarten Lankhorst @ 2013-03-05 13:59 UTC (permalink / raw)
To: nouveau, Ben Skeggs; +Cc: dri-devel@lists.freedesktop.org
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>
---
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 5fa1326..02e369f 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/nouveau: fix regression in vblanking
2013-03-05 13:59 [PATCH] drm/nouveau: fix regression in vblanking Maarten Lankhorst
@ 2013-03-05 18:08 ` Marcin Slusarz
0 siblings, 0 replies; 2+ messages in thread
From: Marcin Slusarz @ 2013-03-05 18:08 UTC (permalink / raw)
To: Maarten Lankhorst, Ben Skeggs; +Cc: nouveau, dri-devel@lists.freedesktop.org
On Tue, Mar 05, 2013 at 02:59:26PM +0100, Maarten Lankhorst wrote:
> 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>
> ---
> diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
> index 5fa1326..02e369f 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
>
It fixes vblank on my NVA8, thanks.
Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-03-05 18:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 13:59 [PATCH] drm/nouveau: fix regression in vblanking Maarten Lankhorst
2013-03-05 18:08 ` Marcin Slusarz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.