diff options
Diffstat (limited to 'drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drm/nouveau/nouveau_display.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/drm/nouveau/nouveau_display.c b/drm/nouveau/nouveau_display.c index 7ce7fa5cb..3abd6f26d 100644 --- a/drm/nouveau/nouveau_display.c +++ b/drm/nouveau/nouveau_display.c @@ -93,8 +93,9 @@ calc(int blanks, int blanke, int total, int line) } int -nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, - ktime_t *stime, ktime_t *etime) +nouveau_display_scanoutpos(struct drm_crtc *crtc, unsigned int flags, + int *vpos, int *hpos, ktime_t *stime, + ktime_t *etime, const struct drm_display_mode *mode) { struct { struct nv04_disp_mthd_v0 base; @@ -133,24 +134,6 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, } int -nouveau_display_scanoutpos(struct drm_device *dev, unsigned int pipe, - unsigned int flags, int *vpos, int *hpos, - ktime_t *stime, ktime_t *etime, - const struct drm_display_mode *mode) -{ - struct drm_crtc *crtc; - - list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { - if (nouveau_crtc(crtc)->index == pipe) { - return nouveau_display_scanoutpos_head(crtc, vpos, hpos, - stime, etime); - } - } - - return 0; -} - -int nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, int *max_error, struct timeval *time, unsigned flags) { @@ -158,9 +141,8 @@ nouveau_display_vblstamp(struct drm_device *dev, unsigned int pipe, list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { if (nouveau_crtc(crtc)->index == pipe) { - return drm_calc_vbltimestamp_from_scanoutpos(dev, - pipe, max_error, time, flags, - &crtc->hwmode); + return drm_calc_vbltimestamp_from_scanoutpos(crtc, + max_error, time, flags, &crtc->hwmode); } } |