Merge tag 'drm-misc-next-fixes-2017-11-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Fix crtc_id in page_flip event.

* tag 'drm-misc-next-fixes-2017-11-23' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/vblank: Pass crtc_id to page_flip_ioctl.

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 19404e34cd59..37a93cdffb4a 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -1030,6 +1030,7 @@ retry:
                 e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
                 e->event.base.length = sizeof(e->event);
                 e->event.vbl.user_data = page_flip->user_data;
+                e->event.vbl.crtc_id = crtc->base.id;
                 ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);
                 if (ret) {
                         kfree(e);