From: Paulo Zanoni Date: Tue, 14 Jul 2015 19:29:13 +0000 (-0300) Subject: drm/i915: don't disable FBC for pipe A when flipping pipe B X-Git-Tag: firefly_0821_release~176^2~721^2~33^2~185 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e1e26f1b09398fad93ba24be816368714bede7c;p=firefly-linux-kernel-4.4.55.git drm/i915: don't disable FBC for pipe A when flipping pipe B Use the appropriate call. I know there's a discussion about whether we need this call here at all, but removing the call means we'll only update FBC after we get the page flip IRQ. So the user may only see the new frame a little after it should. Let's wait just a little bit more before removing this call since we can rely in the HW tracking for accurate flips. Signed-off-by: Paulo Zanoni Reviewed-by: Rodrigo Vivi Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3dbe3162c848..b25f3cac021a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11539,7 +11539,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, to_intel_plane(primary)->frontbuffer_bit); mutex_unlock(&dev->struct_mutex); - intel_fbc_disable(dev_priv); + intel_fbc_disable_crtc(intel_crtc); intel_frontbuffer_flip_prepare(dev, to_intel_plane(primary)->frontbuffer_bit);