Commit bb83f348 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Reorder drm_vblank_put() vs. need_vlv_dsi_wa

Drop the vblank reference only after we've done the hideous
need_vlv_dsi_wa stuff. This will make it easier to reuse the
the vblank evasion machinery elsewhere.

Keeping the vblank reference for a bit longer is not a
problem. In fact we might want to not drop it at all until
intel_pipe_update_end(), but we'll leave that idea for later.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231213102519.13500-3-ville.syrjala@linux.intel.comReviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
parent c045bc42
...@@ -614,8 +614,6 @@ void intel_pipe_update_start(struct intel_atomic_state *state, ...@@ -614,8 +614,6 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
finish_wait(wq, &wait); finish_wait(wq, &wait);
drm_crtc_vblank_put(&crtc->base);
/* /*
* On VLV/CHV DSI the scanline counter would appear to * On VLV/CHV DSI the scanline counter would appear to
* increment approx. 1/3 of a scanline before start of vblank. * increment approx. 1/3 of a scanline before start of vblank.
...@@ -634,6 +632,8 @@ void intel_pipe_update_start(struct intel_atomic_state *state, ...@@ -634,6 +632,8 @@ void intel_pipe_update_start(struct intel_atomic_state *state,
while (need_vlv_dsi_wa && scanline == vblank_start) while (need_vlv_dsi_wa && scanline == vblank_start)
scanline = intel_get_crtc_scanline(crtc); scanline = intel_get_crtc_scanline(crtc);
drm_crtc_vblank_put(&crtc->base);
crtc->debug.scanline_start = scanline; crtc->debug.scanline_start = scanline;
crtc->debug.start_vbl_time = ktime_get(); crtc->debug.start_vbl_time = ktime_get();
crtc->debug.start_vbl_count = intel_crtc_get_vblank_counter(crtc); crtc->debug.start_vbl_count = intel_crtc_get_vblank_counter(crtc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment