diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-11-24 02:32:29 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-11-24 02:32:29 +0100 |
| commit | 0b21871e3d53dbfb22371899afff39af1bae6703 (patch) | |
| tree | 99cacb1fc2d7b478874b8d132fbbb283ade4242e /drivers | |
| parent | drm/ttm: don't attempt to use hugepages if dma32 requested (v2) (diff) | |
| parent | drm/vblank: Pass crtc_id to page_flip_ioctl. (diff) | |
| download | linux-0b21871e3d53dbfb22371899afff39af1bae6703.tar.xz linux-0b21871e3d53dbfb22371899afff39af1bae6703.zip | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_plane.c | 1 |
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); |