Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/drm_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -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.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);