diff options
| author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2017-04-04 17:52:21 +0100 |
|---|---|---|
| committer | Abhinav Kumar <abhinavk@codeaurora.org> | 2018-08-21 17:24:32 -0700 |
| commit | bf652034e39b849ce56e9c64e01a160bc029deaa (patch) | |
| tree | 22ad551137675ef4677fb877531c024f36a6701a /drivers/gpu/drm/drm_irq.c | |
| parent | 4dabf448ae341dd492b45eb0f82fdd77ee5ef584 (diff) | |
drm: Pass CRTC ID in userspace vblank events
With the atomic API, it is possible that a single commit affects
multiple crtcs. If the user requests an event with that commit, one
event will be sent for each CRTC, but it is not possible to distinguish
which crtc an event is for in user space. To solve this, the reserved
field in struct drm_vblank_event is repurposed to include the crtc_id
which the event is for.
The DRM_CAP_CRTC_IN_VBLANK_EVENT is added to allow userspace to query if
the crtc field will be set properly.
[daniels: Rebased, using Maarten's forward-port.]
Change-Id: I48b6b3ab4c97b20b79ebff0cb367acb1f53e95cc
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
Cc: Maarten Lankhorst <maarten.lankhorst@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170404165221.28240-2-daniels@collabora.com
[abhinavk@codeaurora.org: resolved trivial merge conflicts]
Git-commit: 5db06a8a98f515f67446a69c57577c4c363ec65d
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 4ddbc49125cd..c960b9f4bc5d 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1098,6 +1098,7 @@ EXPORT_SYMBOL(drm_arm_vblank_event); void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, struct drm_pending_vblank_event *e) { + e->event.crtc_id = crtc->base.id; drm_arm_vblank_event(crtc->dev, drm_crtc_index(crtc), e); } EXPORT_SYMBOL(drm_crtc_arm_vblank_event); @@ -1144,6 +1145,7 @@ EXPORT_SYMBOL(drm_send_vblank_event); void drm_crtc_send_vblank_event(struct drm_crtc *crtc, struct drm_pending_vblank_event *e) { + e->event.crtc_id = crtc->base.id; drm_send_vblank_event(crtc->dev, drm_crtc_index(crtc), e); } EXPORT_SYMBOL(drm_crtc_send_vblank_event); |