From: Maarten Lankhorst Date: Tue, 14 Jul 2015 11:46:40 +0000 (+0200) Subject: drm/i915: Calculate vblank timestamping constants before enabling vblank. X-Git-Tag: v4.3-rc1~20^2~40^2~28 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3a03dfb057d0ee5f3146ffe40179af3ed7e48213;p=linux-block.git 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 Reviewed-by: Daniel Stone Signed-off-by: Daniel Vetter --- 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); }