These provide crtc-id based functions instead of pipe-number, while also offering higher resolution time (ns) and wider frame count (64) as required by the Vulkan API. v2: * Check for DRIVER_MODESET in new crtc-based vblank ioctls Failing to check this will oops the driver. * Ensure vblank interupt is running in crtc_get_sequence ioctl The sequence and timing values are not correct while the interrupt is off, so make sure it's running before asking for them. * Short-circuit get_sequence if the counter is enabled and accurate Steal the idea from the code in wait_vblank to avoid the expense of drm_vblank_get/put * Return active state of crtc in crtc_get_sequence ioctl Might be useful for applications that aren't in charge of modesetting? * Use drm_crtc_vblank_get/put in new crtc-based vblank sequence ioctls Daniel Vetter prefers these over the old drm_vblank_put/get APIs. * Return s64 ns instead of u64 in new sequence event Suggested-by: Daniel Vetter <daniel@ffwll.ch> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> v3: * Removed FIRST_PIXEL_OUT_FLAG * Document that the timestamp in the query and event are that of the first pixel leaving the display engine for the display (using the same wording as the Vulkan spec). Suggested-by: Michel Dänzer <michel@daenzer.net> Acked-by: Dave Airlie <airlied@redhat.com> [airlied: left->leaves (Michel)]
Showing the changes to include/uapi (1 of 5 files). Show all
Unified · Split
| @@ -737,6 +737,28 @@ struct drm_syncobj_array { · 736 unmodified lines | |||
| 737 | __u32 pad; | 737 | __u32 pad; |
| 738 | }; | 738 | }; |
| 739 | 739 | ||
| 740 | /* Query current scanout sequence number */ | ||
| 741 | struct drm_crtc_get_sequence { | ||
| 742 | __u32 crtc_id; /* requested crtc_id */ | ||
| 743 | __u32 active; /* return: crtc output is active */ | ||
| 744 | __u64 sequence; /* return: most recent vblank sequence */ | ||
| 745 | __s64 sequence_ns; /* return: most recent time of first pixel out */ | ||
| 746 | }; | ||
| 747 | |||
| 748 | /* Queue event to be delivered at specified sequence. Time stamp marks | ||
| 749 | * when the first pixel of the refresh cycle leaves the display engine | ||
| 750 | * for the display | ||
| 751 | */ | ||
| 752 | #define DRM_CRTC_SEQUENCE_RELATIVE 0x00000001 /* sequence is relative to current */ | ||
| 753 | #define DRM_CRTC_SEQUENCE_NEXT_ON_MISS 0x00000002 /* Use next sequence if we've missed */ | ||
| 754 | |||
| 755 | struct drm_crtc_queue_sequence { | ||
| 756 | __u32 crtc_id; | ||
| 757 | __u32 flags; | ||
| 758 | __u64 sequence; /* on input, target sequence. on output, actual sequence */ | ||
| 759 | __u64 user_data; /* user data passed to event */ | ||
| 760 | }; | ||
| 761 | |||
| 740 | #if defined(__cplusplus) | 762 | #if defined(__cplusplus) |
| 741 | } | 763 | } |
| 742 | #endif | 764 | #endif |
| @@ -819,6 +841,9 @@ extern "C" { · 76 unmodified lines | |||
| 819 | 841 | ||
| 820 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) | 842 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) |
| 821 | 843 | ||
| 844 | #define DRM_IOCTL_CRTC_GET_SEQUENCE DRM_IOWR(0x3b, struct drm_crtc_get_sequence) | ||
| 845 | #define DRM_IOCTL_CRTC_QUEUE_SEQUENCE DRM_IOWR(0x3c, struct drm_crtc_queue_sequence) | ||
| 846 | |||
| 822 | #define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) | 847 | #define DRM_IOCTL_UPDATE_DRAW DRM_IOW(0x3f, struct drm_update_draw) |
| 823 | 848 | ||
| 824 | #define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res) | 849 | #define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res) |
| @@ -893,6 +918,7 @@ struct drm_event { · 68 unmodified lines | |||
| 893 | 918 | ||
| 894 | #define DRM_EVENT_VBLANK 0x01 | 919 | #define DRM_EVENT_VBLANK 0x01 |
| 895 | #define DRM_EVENT_FLIP_COMPLETE 0x02 | 920 | #define DRM_EVENT_FLIP_COMPLETE 0x02 |
| 921 | #define DRM_EVENT_CRTC_SEQUENCE 0x03 | ||
| 896 | 922 | ||
| 897 | struct drm_event_vblank { | 923 | struct drm_event_vblank { |
| 898 | struct drm_event base; | 924 | struct drm_event base; |
| @@ -903,6 +929,16 @@ struct drm_event_vblank { · 4 unmodified lines | |||
| 903 | __u32 crtc_id; /* 0 on older kernels that do not support this */ | 929 | __u32 crtc_id; /* 0 on older kernels that do not support this */ |
| 904 | }; | 930 | }; |
| 905 | 931 | ||
| 932 | /* Event delivered at sequence. Time stamp marks when the first pixel | ||
| 933 | * of the refresh cycle leaves the display engine for the display | ||
| 934 | */ | ||
| 935 | struct drm_event_crtc_sequence { | ||
| 936 | struct drm_event base; | ||
| 937 | __u64 user_data; | ||
| 938 | __s64 time_ns; | ||
| 939 | __u64 sequence; | ||
| 940 | }; | ||
| 941 | |||
| 906 | /* typedef area */ | 942 | /* typedef area */ |
| 907 | #ifndef __KERNEL__ | 943 | #ifndef __KERNEL__ |
| 908 | typedef struct drm_clip_rect drm_clip_rect_t; | 944 | typedef struct drm_clip_rect drm_clip_rect_t; |