From d9b8ff03e2448d0aa074f807a24a4ef13f9cb950 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 7 Aug 2010 11:01:37 +0100 Subject: [PATCH] --- yaml --- r: 209747 b: refs/heads/master c: c27ba48e629d2a845f26489fcddc9912673711e7 h: refs/heads/master i: 209745: c59d86119f1a92b7bdfb0bc4c749e0477e09b4d6 209743: b0189f3fb16e7137a4eabcb9a2cf1ca07d7d731f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index afb299cb635b..5518baa294fb 100644 --- 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 index 2a32a7b60c96..41b4caf3d1d8 100644 --- 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);