From: Ville Syrjälä <[email protected]> Warn if use_flipq==true in intel_pipe_update_{start,end}(). These functions are part of the MMIO based commit codepath, so should never get there with use_flipq==true.
We were also warning about use_dsb==true for the same reason. Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/intel_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c index 3fbf25b2e88a..1b5b73f643bc 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc.c +++ b/drivers/gpu/drm/i915/display/intel_crtc.c @@ -548,7 +548,7 @@ void intel_pipe_update_start(struct intel_atomic_state *state, struct intel_vblank_evade_ctx evade; int scanline; - drm_WARN_ON(display->drm, new_crtc_state->use_dsb); + drm_WARN_ON(display->drm, new_crtc_state->use_dsb || new_crtc_state->use_flipq); intel_psr_lock(new_crtc_state); @@ -687,7 +687,7 @@ void intel_pipe_update_end(struct intel_atomic_state *state, u32 end_vbl_count = intel_crtc_get_vblank_counter(crtc); ktime_t end_vbl_time = ktime_get(); - drm_WARN_ON(display->drm, new_crtc_state->use_dsb); + drm_WARN_ON(display->drm, new_crtc_state->use_dsb || new_crtc_state->use_flipq); if (new_crtc_state->do_async_flip) goto out; -- 2.51.2
