poma
2015-Dec-15 11:11 UTC
[Nouveau] [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
On 10.11.2015 17:41, Thierry Reding wrote:> On Tue, Nov 10, 2015 at 05:37:31PM +0100, Thierry Reding wrote: >> From: Daniel Vetter <daniel.vetter at ffwll.ch> >> >> Apparently pre-nv50 pageflip events happen before the actual vblank >> period. Therefore that functionality got semi-disabled in >> >> commit af4870e406126b7ac0ae7c7ce5751f25ebe60f28 >> Author: Mario Kleiner <mario.kleiner.de at gmail.com> >> Date: Tue May 13 00:42:08 2014 +0200 >> >> drm/nouveau/kms/nv04-nv40: fix pageflip events via special case. >> >> Unfortunately that hack got uprooted in >> >> commit cc1ef118fc099295ae6aabbacc8af94d8d8885eb >> Author: Thierry Reding <treding at nvidia.com> >> Date: Wed Aug 12 17:00:31 2015 +0200 >> >> drm/irq: Make pipe unsigned and name consistent >> >> Triggering a warning when trying to sample the vblank timestamp for a >> non-existing pipe. There's a few ways to fix this: >> >> - Open-code the old behaviour, which just enshrines this slight >> breakage of the userspace ABI. >> >> - Revert Mario's commit and again inflict broken timestamps, again not >> pretty. >> >> - Fix this for real by delaying the pageflip TS until the next vblank >> interrupt, thereby making it accurate. >> >> This patch implements the third option. Since having a page flip >> interrupt that happens when the pageflip gets armed and not when it >> completes in the next vblank seems to be fairly common (older i915 hw >> works very similarly) create a new helper to arm vblank events for >> such drivers. >> >> v2 (Mario Kleiner): >> - Fix function prototypes in drmP.h >> - Add missing vblank_put() for pageflip completion without >> pageflip event. >> - Initialize sequence number for queued pageflip event to avoid >> trouble in drm_handle_vblank_events(). >> - Remove dead code and spelling fix. >> >> v3 (Mario Kleiner): >> - Add a signed-off-by and cc stable tag per Ilja's advice. >> >> v4 (Thierry Reding): >> - Fix kerneldoc typo, discovered by Michel Dänzer >> - Rearrange tags and changelog >> >> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=106431 >> Cc: Thierry Reding <treding at nvidia.com> >> Cc: Mario Kleiner <mario.kleiner.de at gmail.com> >> Cc: Ben Skeggs <bskeggs at redhat.com> >> Cc: Ilia Mirkin <imirkin at alum.mit.edu> >> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com> >> Reviewed-by: Mario Kleiner <mario.kleiner.de at gmail.com> >> Cc: stable at vger.kernel.org # v4.3 >> Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com> >> Signed-off-by: Thierry Reding <treding at nvidia.com> >> --- >> drivers/gpu/drm/drm_irq.c | 54 ++++++++++++++++++++++++++++++- >> drivers/gpu/drm/nouveau/nouveau_display.c | 19 ++++++----- >> include/drm/drmP.h | 4 +++ >> 3 files changed, 68 insertions(+), 9 deletions(-) > > Hi Dave, > > It'd be great if you could queue this up for fixes, since it gets rid of > a WARN_ON() that is triggered on a number of cards in v4.3. I realize > that this is a tad big for stable, but it's the right way to fix this. > If you'd prefer something smaller, I think we can fix the regression > using a one-line band-aid and then apply this one on top for v4.4. > > Thierry >Apparently not reached @stable (stable: 4.3.3 2015-12-15), so here's one more time.
Emil Velikov
2015-Dec-15 11:21 UTC
[Nouveau] [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
On 15 December 2015 at 11:11, poma <pomidorabelisima at gmail.com> wrote:> > Apparently not reached @stable (stable: 4.3.3 2015-12-15), > so here's one more time. >It has reached 4.4-rcX and will get picked by the stable maintainer (Greg?) in due time. Meanwhile you can ask your distro maintainers to apply it locally until we get an official release that includes it. -Emil
poma
2015-Dec-15 15:01 UTC
[Nouveau] [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
On 15.12.2015 12:21, Emil Velikov wrote:> On 15 December 2015 at 11:11, poma <pomidorabelisima at gmail.com> wrote: > >> >> Apparently not reached @stable (stable: 4.3.3 2015-12-15), >> so here's one more time. >> > It has reached 4.4-rcX and will get picked by the stable maintainer > (Greg?) in due time. Meanwhile you can ask your distro maintainers to > apply it locally until we get an official release that includes it. > > -Emil >It is all but unknown ;) https://bugzilla.redhat.com/show_bug.cgi?id=1281368 Emil, the point is - if it has -not- reached stable at vger.kernel.org, how can it be applied, in the first place. Aye
Reasonably Related Threads
- [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
- [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
- [PATCH] drm/nouveau: Fix pre-nv50 pageflip events
- [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v4)
- [PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v3) -> v4