diff options
| author | Mika Kuoppala <mika.kuoppala@linux.intel.com> | 2013-02-19 12:50:09 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-02-20 01:33:44 +0100 |
| commit | 9ed9809fbee47cb21c5d40e0a6f46101150cc4d4 (patch) | |
| tree | 17a5a8c050bc8505bc55e79e4750beb5d8ead96d | |
| parent | 3e2a155606a0dbe647b87423665fb691941c2fe0 (diff) | |
| download | olio-linux-3.10-9ed9809fbee47cb21c5d40e0a6f46101150cc4d4.tar.xz olio-linux-3.10-9ed9809fbee47cb21c5d40e0a6f46101150cc4d4.zip | |
drm/i915: remove obsolete obj assignment in page flip
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ba8307dc03b..9b0cd866fb6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6960,7 +6960,6 @@ static void do_intel_finish_page_flip(struct drm_device *dev, drm_i915_private_t *dev_priv = dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_unpin_work *work; - struct drm_i915_gem_object *obj; unsigned long flags; /* Ignore early vblank irqs */ @@ -6990,8 +6989,6 @@ static void do_intel_finish_page_flip(struct drm_device *dev, spin_unlock_irqrestore(&dev->event_lock, flags); - obj = work->old_fb_obj; - wake_up_all(&dev_priv->pending_flip_queue); queue_work(dev_priv->wq, &work->work); |