diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-17 10:45:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-17 10:53:43 +1000 |
| commit | bd21a37d41c3b3088aeae59f54fd82de0ddb6fdd (patch) | |
| tree | 985dc5b65d2adb36a3671e78a174b3aaac4b6f50 /include/drm/drm_drv.h | |
| parent | d7205d5c0f2b09d900231de9026b97105c37d343 (diff) | |
| parent | 6c94804fde4415f3938778155d8e665e6870a46d (diff) | |
Merge remote-tracking branch 'pfdo/drm-next' into drm-next
Pull in drm-next for the object find API changes.
Fix the one place the API crashes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drm_drv.h')
| -rw-r--r-- | include/drm/drm_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index ee06ecd6c01f..412e83a4d3db 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -324,7 +324,7 @@ struct drm_driver { */ bool (*get_vblank_timestamp) (struct drm_device *dev, unsigned int pipe, int *max_error, - struct timeval *vblank_time, + ktime_t *vblank_time, bool in_vblank_irq); /** |