From 29b2dd633bbbe0b2ef3a90a909ea7e9d722fb0f6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 15 May 2010 09:57:03 +0100 Subject: [PATCH] --- yaml --- r: 199591 b: refs/heads/master c: 9908ff736adf261e749b4887486a32ffa209304c h: refs/heads/master i: 199589: e812ac0c344d23346fca8ee114492371d549f285 199587: 94358521e90125310cd7d845e48200f797897626 199583: 7a6c98ef28e3dd7a1dbe19e4b92a5f816a8bc89b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 085221b0604d..48882f3ab1f8 100644 --- 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 index e94d1db35364..f946332612ec 100644 --- 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; }