drm/nouveau: Fix pre-nv50 pageflip events (v4)
Subsystems (4)
PATCH 1/1 drm/nouveau: Fix pre-nv50 pageflip events (v4)
From: Daniel Vetter <[email protected]>
Apparently pre-nv50 pageflip events happen before the actual vblank period. Therefore that functionality got semi-disabled in
commit af4870e406126b7ac0ae7c7ce5751f25ebe60f28
Author: Mario Kleiner <[email protected]> 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 <[email protected]> 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
--- 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(-)
drivers/gpu/drm/drm_irq.c +53 -1
@@ -944,7 +944,8 @@ static void send_vblank_event(struct drm_device *dev,struct drm_pending_vblank_event *e, unsigned long seq, struct timeval *now) { - WARN_ON_SMP(!spin_is_locked(&dev->event_lock)); + assert_spin_locked(&dev->event_lock); + e->event.sequence = seq; e->event.tv_sec = now->tv_sec; e->event.tv_usec = now->tv_usec;
@@ -957,6 +958,57 @@ static void send_vblank_event(struct drm_device *dev, }/** +* drm_arm_vblank_event - arm vblank event after pageflip +* @dev: DRM device +* @pipe: CRTC index +* @e: the event to prepare to send +* +* A lot of drivers need to generate vblank events for the very next vblank +* interrupt. For example when the page flip interrupt happens when the page +* flip gets armed, but not when it actually executes within the next vblank +* period. This helper function implements exactly the required vblank arming +* behaviour. +* +* Caller must hold event lock. Caller must also hold a vblank reference for +* the event @e, which will be dropped when the next vblank arrives. +* +* This is the legacy version of drm_crtc_arm_vblank_event(). +*/ +void drm_arm_vblank_event (struct drm_device *dev,unsigned int pipe, +struct drm_pending_vblank_event *e) +{ +assert_spin_locked (&dev->event_lock); + + e->pipe = pipe; + e->event.sequence =drm_vblank_count (dev, pipe); +list_add_tail (&e->base.link, &dev->vblank_event_list); +} +EXPORT_SYMBOL (drm_arm_vblank_event); + +/** +* drm_crtc_arm_vblank_event - arm vblank event after pageflip +* @crtc: the source CRTC of the vblank event +* @e: the event to send +* +* A lot of drivers need to generate vblank events for the very next vblank +* interrupt. For example when the page flip interrupt happens when the page +* flip gets armed, but not when it actually executes within the next vblank +* period. This helper function implements exactly the required vblank arming +* behaviour. +* +* Caller must hold event lock. Caller must also hold a vblank reference for +* the event @e, which will be dropped when the next vblank arrives. +* +* This is the native KMS version of drm_arm_vblank_event(). +*/ +void drm_crtc_arm_vblank_event (struct drm_crtc *crtc, +struct drm_pending_vblank_event *e) +{ +drm_arm_vblank_event (crtc->dev,drm_crtc_index (crtc), e); +} +EXPORT_SYMBOL (drm_crtc_arm_vblank_event); + +/** * drm_send_vblank_event - helper to send vblank event after pageflip * @dev: DRM device * @pipe: CRTC index
drivers/gpu/drm/nouveau/nouveau_display.c +11 -8
@@ -827,7 +827,6 @@ nouveau_finish_page_flip(struct nouveau_channel *chan,struct drm_device *dev = drm->dev;struct nouveau_page_flip_state *s;unsigned long flags; -int crtcid =-1 ;spin_lock_irqsave (&dev->event_lock, flags);
@@ -839,15 +838,19 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head);if (s->event) { -/* Vblank timestamps/counts are only correct on >= NV-50 */ -if (drm->device.info.family >=NV_DEVICE_INFO_V0_TESLA ) - crtcid = s->crtc; +if (drm->device.info.family <NV_DEVICE_INFO_V0_TESLA ) { +drm_arm_vblank_event (dev, s->crtc, s->event); + }else { +drm_send_vblank_event (dev, s->crtc, s->event); -drm_send_vblank_event (dev, crtcid, s->event); +/* Give up ownership of vblank for page-flipped crtc */ +drm_vblank_put (dev, s->crtc); + } + } +else { +/* Give up ownership of vblank for page-flipped crtc */ +drm_vblank_put (dev, s->crtc); } - -/* Give up ownership of vblank for page-flipped crtc */ -drm_vblank_put (dev, s->crtc);list_del (&s->head);if (ps)
include/drm/drmP.h +4 -0
@@ -932,6 +932,10 @@ extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, struct drm_pending_vblank_event *e);extern void drm_crtc_send_vblank_event (struct drm_crtc *crtc,struct drm_pending_vblank_event *e); +extern void drm_arm_vblank_event (struct drm_device *dev,unsigned int pipe, +struct drm_pending_vblank_event *e); +extern void drm_crtc_arm_vblank_event (struct drm_crtc *crtc, +struct drm_pending_vblank_event *e);extern bool drm_handle_vblank (struct drm_device *dev,unsigned int pipe);extern bool drm_crtc_handle_vblank (struct drm_crtc *crtc);extern int drm_vblank_get (struct drm_device *dev,unsigned int pipe);
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 62 lines · Thierry Reding
From: Daniel Vetter <[email protected]>
Apparently pre-nv50 pageflip events happen before the actual vblank period. Therefore that functionality got semi-disabled in
commit
af4870e406126b7ac0ae7c7ce5751f25ebe60f28Author: Mario Kleiner <[email protected]> Date: Tue May 13 00:42:08 2014 +0200drm/nouveau/kms/nv04-nv40: fix pageflip events via special case.
Unfortunately that hack got uprooted in
commit
cc1ef118fc099295ae6aabbacc8af94d8d8885ebAuthor: Thierry Reding <[email protected]> Date: Wed Aug 12 17:00:31 2015 +0200drm/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 indrmP.h
- Add missingvblank_put()for pageflip completion without pageflip event.
- Initialize sequence number for queued pageflip event to avoid trouble indrm_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 changelogBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=106431
Cc Thierry Reding <[email protected]>Cc Mario Kleiner <[email protected]>Cc Ben Skeggs <[email protected]>Cc Ilia Mirkin <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Reviewed-by Mario Kleiner <[email protected]>Cc [email protected] # v4.3Signed-off-by Mario Kleiner <[email protected]>Signed-off-by Thierry Reding <[email protected]>
Quoted 5 lines
--- 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
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 71 lines · Thierry Reding
Quoted 62 lines · Thierry Reding
From: Daniel Vetter <[email protected]>
Apparently pre-nv50 pageflip events happen before the actual vblank period. Therefore that functionality got semi-disabled in
commit
af4870e406126b7ac0ae7c7ce5751f25ebe60f28Author: Mario Kleiner <[email protected]> Date: Tue May 13 00:42:08 2014 +0200drm/nouveau/kms/nv04-nv40: fix pageflip events via special case.
Unfortunately that hack got uprooted in
commit
cc1ef118fc099295ae6aabbacc8af94d8d8885ebAuthor: Thierry Reding <[email protected]> Date: Wed Aug 12 17:00:31 2015 +0200drm/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 indrmP.h
- Add missingvblank_put()for pageflip completion without pageflip event.
- Initialize sequence number for queued pageflip event to avoid trouble indrm_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 changelogBugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=106431
Cc Thierry Reding <[email protected]>Cc Mario Kleiner <[email protected]>Cc Ben Skeggs <[email protected]>Cc Ilia Mirkin <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Reviewed-by Mario Kleiner <[email protected]>Cc [email protected] # v4.3Signed-off-by Mario Kleiner <[email protected]>Signed-off-by Thierry Reding <[email protected]>Quoted 5 lines
--- 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,
Quoted 8 lines
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.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 4 lines · poma
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
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau
Quoted 12 lines · Emil Velikov
Quoted 4 lines · poma
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 [email protected], how can it be applied, in the first place.
Aye
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · poma
Quoted 10 lines · Emil Velikov
Quoted 4 lines · poma
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.
Quoted 8 lines
Quoted 2 lines
-Emil
It is all but unknown ;)
https://bugzilla.redhat.com/show_bug.cgi?id=1281368Emil, the point is - if it has -not- reached [email protected], how can it be applied, in the first place.
The same way many others do ? I'd imagine there is a tool/script which parses through the development tree, which would explain why (many?) people explicitly suppress git from sending an email yet things still work. There is extra information in the documentation [1] if you're interested.
-Emil
[1] https://www.kernel.org/doc/Documentation/stable_kernel_rules.txt
Quoted 18 lines · Emil Velikov
Quoted 17 lines · poma
Quoted 12 lines · Emil Velikov
Quoted 4 lines · poma
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
Quoted 7 lines
Quoted 2 lines
Emil, the point is - if it has -not- reached [email protected], how can it be applied, in the first place.
The same way many others do ? I'd imagine there is a tool/script which parses through the development tree, which would explain why (many?) people explicitly suppress git from sending an email yet things still work. There is extra information in the documentation [1] if you're interested.
Yes, this is in the queue, along with 276 other patches that I need to apply as well. The backlog is large this time of year, sorry.
greg k-h
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel