---

yaml --- r: 199591 b: refs/heads/master c: 9908ff7 h: refs/heads/master i: 199589: e812ac0 199587: 9435852 199583: 7a6c98e v: v3
git-mirror · May 26, 2010 · 29b2dd6 · 29b2dd6
1 parent 0ee45c8
commit 29b2dd6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1befe71fa7a79ab733011b045639d8d809924ad
+refs/heads/master: 9908ff736adf261e749b4887486a32ffa209304c
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4589,12 +4589,6 @@ void intel_finish_page_flip(struct drm_device *dev, int pipe)
 	spin_lock_irqsave(&dev->event_lock, flags);
 	work = intel_crtc->unpin_work;
 	if (work == NULL || !work->pending) {
-		if (work && !work->pending) {
-			obj_priv = to_intel_bo(work->pending_flip_obj);
-			DRM_DEBUG_DRIVER("flip finish: %p (%d) not pending?\n",
-					 obj_priv,
-					 atomic_read(&obj_priv->pending_flip));
-		}
 		spin_unlock_irqrestore(&dev->event_lock, flags);
 		return;
 	}