Commit 5db06a8a authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Stone

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.]
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: default avatarDaniel Stone <daniels@collabora.com>
Cc: Maarten Lankhorst <maarten.lankhorst@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170404165221.28240-2-daniels@collabora.com
parent 1bbfe9d1
...@@ -286,6 +286,9 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ ...@@ -286,6 +286,9 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
case DRM_CAP_ADDFB2_MODIFIERS: case DRM_CAP_ADDFB2_MODIFIERS:
req->value = dev->mode_config.allow_fb_modifiers; req->value = dev->mode_config.allow_fb_modifiers;
break; break;
case DRM_CAP_CRTC_IN_VBLANK_EVENT:
req->value = 1;
break;
default: default:
return -EINVAL; return -EINVAL;
} }
......
...@@ -1026,6 +1026,7 @@ void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, ...@@ -1026,6 +1026,7 @@ void drm_crtc_arm_vblank_event(struct drm_crtc *crtc,
e->pipe = pipe; e->pipe = pipe;
e->event.sequence = drm_vblank_count(dev, pipe); e->event.sequence = drm_vblank_count(dev, pipe);
e->event.crtc_id = crtc->base.id;
list_add_tail(&e->base.link, &dev->vblank_event_list); list_add_tail(&e->base.link, &dev->vblank_event_list);
} }
EXPORT_SYMBOL(drm_crtc_arm_vblank_event); EXPORT_SYMBOL(drm_crtc_arm_vblank_event);
...@@ -1056,6 +1057,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc, ...@@ -1056,6 +1057,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
now = get_drm_timestamp(); now = get_drm_timestamp();
} }
e->pipe = pipe; e->pipe = pipe;
e->event.crtc_id = crtc->base.id;
send_vblank_event(dev, e, seq, &now); send_vblank_event(dev, e, seq, &now);
} }
EXPORT_SYMBOL(drm_crtc_send_vblank_event); EXPORT_SYMBOL(drm_crtc_send_vblank_event);
......
...@@ -647,6 +647,7 @@ struct drm_gem_open { ...@@ -647,6 +647,7 @@ struct drm_gem_open {
#define DRM_CAP_CURSOR_HEIGHT 0x9 #define DRM_CAP_CURSOR_HEIGHT 0x9
#define DRM_CAP_ADDFB2_MODIFIERS 0x10 #define DRM_CAP_ADDFB2_MODIFIERS 0x10
#define DRM_CAP_PAGE_FLIP_TARGET 0x11 #define DRM_CAP_PAGE_FLIP_TARGET 0x11
#define DRM_CAP_CRTC_IN_VBLANK_EVENT 0x12
/** DRM_IOCTL_GET_CAP ioctl argument type */ /** DRM_IOCTL_GET_CAP ioctl argument type */
struct drm_get_cap { struct drm_get_cap {
...@@ -851,7 +852,7 @@ struct drm_event_vblank { ...@@ -851,7 +852,7 @@ struct drm_event_vblank {
__u32 tv_sec; __u32 tv_sec;
__u32 tv_usec; __u32 tv_usec;
__u32 sequence; __u32 sequence;
__u32 reserved; __u32 crtc_id; /* 0 on older kernels that do not support this */
}; };
/* typedef area */ /* typedef area */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment