diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-15 05:56:11 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-15 05:56:11 +0200 |
| commit | 35b8a749242109db7b4af1b6c420ea7f9ded6b2b (patch) | |
| tree | 515ca36eae27e640eef6da05c40c7b7cccdea76c /drivers/gpu/drm/vc4/vc4_drv.h | |
| parent | Merge tag 'drm-intel-next-2016-07-11' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | drm/vc4: remove redundant ret status check (diff) | |
| download | linux-35b8a749242109db7b4af1b6c420ea7f9ded6b2b.tar.xz linux-35b8a749242109db7b4af1b6c420ea7f9ded6b2b.zip | |
Merge tag 'drm-vc4-next-2016-07-12' of https://github.com/anholt/linux into drm-next
This pull request brings in new vc4 plane formats for Android, precise
vblank timestamping, and a couple of small cleanups.
* tag 'drm-vc4-next-2016-07-12' of https://github.com/anholt/linux:
drm/vc4: remove redundant ret status check
drm/vc4: Implement precise vblank timestamping.
drm/vc4: Bind the HVS before we bind the individual CRTCs.
gpu: drm: vc4_hdmi: add missing of_node_put after calling of_parse_phandle
drm: vc4: enable XBGR8888 and ABGR8888 pixel formats
drm/vc4: clean up error exit path on failed dpi_connector allocation
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index c799baabc008..8e3b84e758ac 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -415,6 +415,13 @@ extern struct platform_driver vc4_crtc_driver; int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id); void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id); int vc4_crtc_debugfs_regs(struct seq_file *m, void *arg); +int vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, + unsigned int flags, int *vpos, int *hpos, + ktime_t *stime, ktime_t *etime, + const struct drm_display_mode *mode); +int vc4_crtc_get_vblank_timestamp(struct drm_device *dev, unsigned int crtc_id, + int *max_error, struct timeval *vblank_time, + unsigned flags); /* vc4_debugfs.c */ int vc4_debugfs_init(struct drm_minor *minor); |