From: Maarten Lankhorst Date: Mon, 19 Oct 2015 15:09:23 +0000 (+0200) Subject: drm/i915: Do not wait for flips in intel_crtc_disable_noatomic. X-Git-Tag: v4.5-rc1~74^2~37^2~192 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fc32b1fdce1f85ea5a1277478f5d916ac3d6a284;p=linux.git drm/i915: Do not wait for flips in intel_crtc_disable_noatomic. intel_crtc_disable_noatomic is called from hw readout during init, resume and possibly reset. During init it's too early to have a page flip queued, before suspending all page flips should be finished and during hw reset all page flips should be removed. It's a bug when there are pending flips here, complain with WARN_ON instead of handling it. Signed-off-by: Maarten Lankhorst Link: http://patchwork.freedesktop.org/patch/msgid/562507A3.3080901@linux.intel.com Reviewed-by: Ander Conselvan de Oliveira Reviewed-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c1286896aca3..bd1977ed6e88 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6255,7 +6255,8 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc) return; if (to_intel_plane_state(crtc->primary->state)->visible) { - intel_crtc_wait_for_pending_flips(crtc); + WARN_ON(intel_crtc->unpin_work); + intel_pre_disable_primary(crtc); }