---

yaml --- r: 209747 b: refs/heads/master c: c27ba48 h: refs/heads/master i: 209745: c59d861 209743: b0189f3 v: v3
git-mirror · Aug 9, 2010 · d9b8ff0 · d9b8ff0
1 parent 6c7084d
commit d9b8ff0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ddb954b9ee50824977d2931e0ff58b3050b337d
+refs/heads/master: c27ba48e629d2a845f26489fcddc9912673711e7
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4171,9 +4171,6 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 	/* Flush the plane changes */
 	ret = intel_pipe_set_base(crtc, x, y, old_fb);
 
-	if ((IS_I965G(dev) || plane == 0))
-		intel_update_fbc(crtc, &crtc->mode);
-
 	intel_update_watermarks(dev);
 
 	drm_vblank_post_modeset(dev, pipe);