diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
| commit | b740e76936c14354a9c5676a3eed839ea8472c41 (patch) | |
| tree | dd0b74f64007dba28fcf12595af893e367d307ff /drivers/gpu/drm/drm_internal.h | |
| parent | drm/atomic-helper: Simplify commit tracking locking (diff) | |
| parent | Backmerge tag 'v4.12-rc7' into drm-next (diff) | |
| download | linux-b740e76936c14354a9c5676a3eed839ea8472c41.tar.xz linux-b740e76936c14354a9c5676a3eed839ea8472c41.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Required for Daniel's drm_vblank_cleanup cleanup
Diffstat (limited to 'drivers/gpu/drm/drm_internal.h')
| -rw-r--r-- | drivers/gpu/drm/drm_internal.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 116de27cf8f3..f89371e920e6 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -148,4 +148,17 @@ static inline int drm_debugfs_crtc_crc_add(struct drm_crtc *crtc) { return 0; } + #endif + +/* drm_syncobj.c */ +void drm_syncobj_open(struct drm_file *file_private); +void drm_syncobj_release(struct drm_file *file_private); +int drm_syncobj_create_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); +int drm_syncobj_destroy_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); +int drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); +int drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_private); |