diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-07-14 13:46:40 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-07-14 17:18:38 +0200 |
| commit | 3a03dfb057d0ee5f3146ffe40179af3ed7e48213 (patch) | |
| tree | fec575e23441c36e4b2f95fa7d5ede41178b3c4e | |
| parent | 4be40c987aa0867a8fa77c12d5ed6fa2f8853dbc (diff) | |
| download | talos-obmc-linux-3a03dfb057d0ee5f3146ffe40179af3ed7e48213.tar.gz talos-obmc-linux-3a03dfb057d0ee5f3146ffe40179af3ed7e48213.zip | |
drm/i915: Calculate vblank timestamping constants before enabling vblank.
This is required to properly initialize vblanks on the active crtc.
Without it drm_calc_vbltimestamp_from_scanoutpos can fail with
crtc 0: Noop due to uninitialized mode.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5254a3a5a268..1b8a17c67ff5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15239,6 +15239,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc) /* restore vblank interrupts to correct state */ drm_crtc_vblank_reset(&crtc->base); if (crtc->active) { + drm_calc_timestamping_constants(&crtc->base, &crtc->base.hwmode); update_scanline_offset(crtc); drm_crtc_vblank_on(&crtc->base); } |
