History

Merge tag 'topic/drm-misc-2016-09-25' of git://anongit.freedesktop.org/drm-intel into drm-next

- more core cleanup patches to prep drm_file to be used for kernel-internal contexts (David Herrmann) - more split-up+docs for drm_crtc.c - lots of small fixes and polish all over * tag 'topic/drm-misc-2016-09-25' of git://anongit.freedesktop.org/drm-intel: (37 commits) drm: bridge: analogix/dp: mark symbols static where possible drm/bochs: mark bochs_connector_get_modes() static drm/bridge: analogix_dp: Improve panel on time drm/bridge: analogix_dp: Don't read EDID if panel present drm/bridge: analogix_dp: Remove duplicated code Revert "drm/i2c: tda998x: don't register the connector" drm: Fix plane type uabi breakage dma-buf/sync_file: free fences array in num_fences is 1 drm/i2c: tda998x: don't register the connector drm: Don't swallow error codes in drm_dev_alloc() drm: Distinguish no name from ENOMEM in set_unique() drm: Remove dirty property from docs drm/doc: Document color space handling drm: Extract drm_color_mgmt.[hc] drm/doc: Polish plane composition property docs drm: Conslidate blending properties in drm_blend.[hc] drm/doc: Polish for drm_plane.[hc] drm: Extract drm_plane.[hc] drm/tilcdc: Add atomic and crtc headers to crtc.c drm: Fix typo in encoder docs ...

Dave Airlie committed 10 years ago

Commit 3f346d52 parents 196ebdc 089cfdd79 files · +3230 −3228Browse files

Showing the changes to include/uapi (1 of 79 files). Show all

Unified · Split

include/uapi/linux/sync_file.h+5−8
@@ -85,15 +85,12 @@ struct sync_file_info { · 84 unmodified lines
85#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data)85#define SYNC_IOC_MERGE _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data)
86 86
87/**87/**
88 * DOC: SYNC_IOC_FENCE_INFO - get detailed information on a fence88 * DOC: SYNC_IOC_FILE_INFO - get detailed information on a sync_file
89 *89 *
90 * Takes a struct sync_file_info_data with extra space allocated for pt_info.90 * Takes a struct sync_file_info. If num_fences is 0, the field is updated
91 * Caller should write the size of the buffer into len. On return, len is91 * with the actual number of fences. If num_fences is > 0, the system will
92 * updated to reflect the total size of the sync_file_info_data including92 * use the pointer provided on sync_fence_info to return up to num_fences of
93 * pt_info.93 * struct sync_fence_info, with detailed fence information.
94 *
95 * pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence.
96 * To iterate over the sync_pt_infos, use the sync_pt_info.len field.
97 */94 */
98#define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)95#define SYNC_IOC_FILE_INFO _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)
99 96

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t