Skip to content

Commit b8a3365

Browse files
committed
drm/vblank: Pass crtc_id to page_flip_ioctl.
We added crtc_id to the atomic ioctl, but forgot to add it for vblank and page flip events. Commit bd386e5 ("drm: Reorganize drm_pending_event to support future event types [v2]") added it to the vblank event, but page flip event was still missing. Correct this and add a test for making sure we always set crtc_id correctly. Fixes: bd386e5 ("drm: Reorganize drm_pending_event to support future event types [v2]") Fixes: 5db06a8 ("drm: Pass CRTC ID in userspace vblank events") Cc: Daniel Stone <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Gustavo Padovan <[email protected]> Cc: Sean Paul <[email protected]> Cc: [email protected] Cc: <[email protected]> # v4.12+ Reviewed-by: Daniel Vetter <[email protected]> #irc Testcase: igt/kms_vblank/crtc_id Signed-off-by: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f150891 commit b8a3365

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/gpu/drm/drm_plane.c

+1
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
10301030
e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
10311031
e->event.base.length = sizeof(e->event);
10321032
e->event.vbl.user_data = page_flip->user_data;
1033+
e->event.vbl.crtc_id = crtc->base.id;
10331034
ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);
10341035
if (ret) {
10351036
kfree(e);

0 commit comments

Comments
 (0)