Commit 0b21871e authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2017-11-23' of...

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.
parents 33d22c2e b8a3365a
...@@ -1030,6 +1030,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, ...@@ -1030,6 +1030,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
e->event.base.type = DRM_EVENT_FLIP_COMPLETE; e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
e->event.base.length = sizeof(e->event); e->event.base.length = sizeof(e->event);
e->event.vbl.user_data = page_flip->user_data; 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); ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base);
if (ret) { if (ret) {
kfree(e); kfree(e);
......
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