search for: nv50_disp_intr

...push buffer errors in dmesg output: [ 6625.450394] nouveau 0000:01:00.0: disp: ERROR 1 [PUSHBUFFER_ERR] 02 [] chid 0 mthd 0000 data 00000400 I tried setting CONFIG_NOUVEAU_DEBUG=5 (tracing) to try and collect further debug info, but nothing caught the eye. The error message in question comes from nv50_disp_intr_error in drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c:613,645. And nv50_disp_intr_error is called from nv50_disp_intr in the following while block: drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c:647,658 void nv50_disp_intr(struct nv50_disp *disp) { struct nvkm_device *device = disp->...

...00001 > ffff88029f71aa00 0000000000000000 0000000000000000 0000000004000000 > 0000000004000000 ffff8802afcc3e38 ffffffffa01843b5 ffff8802afcc3df8 > Call Trace: > <IRQ> > [<ffffffffa0159d8a>] ? nouveau_event_trigger+0xaa/0xe0 [nouveau] > [<ffffffffa01843b5>] nv50_disp_intr+0xc5/0x200 [nouveau] > [<ffffffff816fbacc>] ? _raw_spin_unlock_irqrestore+0x2c/0x50 > [<ffffffff816ff98d>] ? notifier_call_chain+0x4d/0x70 > [<ffffffffa017a105>] nouveau_mc_intr+0xb5/0x110 [nouveau] > [<ffffffffa01d45ff>] nouveau_irq_handler+0x6f/0x80 [nouvea...

...st at 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 c168ae3..96268b7 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c @@ -1285,6 +1285,57 @@ nv50_disp_intr(struct nouveau_subdev *subdev) } } +u32 nv50_disp_get_vblank_count(struct nouveau_disp *disp, int head) +{ + if (head < 0 || head >= 2) + return 0; + + return nv_rd32(disp, 0x616340 + head * 0x800) >> 16; +} + +int nv50_disp_get_scanoutpos(struct nouveau_disp *disp, int head, int...

...mit you mentioned that's at fault, and I'm still working to find a proper solution before I revert it. Ben. > > I tried setting CONFIG_NOUVEAU_DEBUG=5 (tracing) to try and collect > further debug info, but nothing caught the eye. > > The error message in question comes from nv50_disp_intr_error in > drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c:613,645. > And nv50_disp_intr_error is called from nv50_disp_intr in the > following while block: > drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c:647,658 > void > nv50_disp_intr(struct nv50_disp *disp) > { >...

...t at 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 7e3875d..35e526b 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c @@ -1266,13 +1266,15 @@ nv50_disp_intr(struct nouveau_subdev *subdev) } if (intr1 & 0x00000004) { - nouveau_event_trigger(priv->base.vblank, 0); + if (priv->base.vblank) + nouveau_event_trigger(priv->base.vblank, 0); nv_wr32(priv, 0x610024, 0x00000004); intr1 &= ~0x00000004; } if (intr1 & 0x000...

...6>] _raw_spin_lock_irqsave+0x46/0x60 [<ffffffffa0086269>] drm_handle_vblank+0x69/0x400 [drm] [<ffffffffa0180847>] nouveau_drm_vblank_handler+0x27/0x30 [nouveau] [<ffffffffa0101e00>] nouveau_event_trigger+0x90/0xd0 [nouveau] [<ffffffffa012dafd>] nv50_disp_intr+0xdd/0x230 [nouveau] [<ffffffffa0120451>] nouveau_mc_intr+0xa1/0x100 [nouveau] [<ffffffff810f3c7c>] handle_irq_event_percpu+0x6c/0x3d0 [<ffffffff810f4028>] handle_irq_event+0x48/0x70 [<ffffffff810f71ca>] handle_fasteoi_irq+0x5a/0x100 [<f...

...- > diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c > index 7e3875d..35e526b 100644 > --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c > +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c > @@ -1266,13 +1266,15 @@ nv50_disp_intr(struct nouveau_subdev *subdev) > } > > if (intr1 & 0x00000004) { > - nouveau_event_trigger(priv->base.vblank, 0); > + if (priv->base.vblank) > + nouveau_event_trigger(priv->base.vblank, 0); >...

This series was originally motivated by a deadlock, introduced in commit 1d7c71a3e2f77336df536855b0efd2dc5bdeb41b 'drm/nouveau/disp: port vblank handling to event interface', due to inverted lock order between nouveau_drm_vblank_enable() and nouveau_drm_vblank_handler() (the complete lockdep report is included in the patch 4/5 changelog). Because this series fixes the vblank event

https://bugs.freedesktop.org/show_bug.cgi?id=58556 Priority: medium Bug ID: 58556 Assignee: nouveau at lists.freedesktop.org Summary: MacBook Pro 5,1 with nVidia 9400m and 9600m, scrambled screen QA Contact: xorg-team at lists.x.org Severity: major Classification: Unclassified OS: other