From cfbc6b15b6c81859d1a59937d1707644fccd48d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=3D=3Futf-8=3Fq=3FMichel=5FD=3DC3=3DA4nzer=3F=3D?= Date: Wed, 25 Oct 2006 00:10:59 +1000 Subject: [PATCH] --- yaml --- r: 43919 b: refs/heads/master c: 21fa60ed4eab5b3b28d05930bb086615ecc191b1 h: refs/heads/master i: 43917: 6797e35834f221e16045e7030897b2149667f8cd 43915: e6654907755f745f73f830fec0637c27ed98331e 43911: bc9e90b9b0609fc11f7d315546826565b4a3b50b 43903: f4245a50274882dca7b57baa470156b4519ccb49 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/i915_irq.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bae00c73c5a3..2fd3b2ebae80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dbb232c4d6b6c89fc367f7566c7c87dd3b56cd7 +refs/heads/master: 21fa60ed4eab5b3b28d05930bb086615ecc191b1 diff --git a/trunk/drivers/char/drm/i915_irq.c b/trunk/drivers/char/drm/i915_irq.c index df28bc1e84c6..40c55edfa2ee 100644 --- a/trunk/drivers/char/drm/i915_irq.c +++ b/trunk/drivers/char/drm/i915_irq.c @@ -392,11 +392,6 @@ int i915_vblank_swap(DRM_IOCTL_ARGS) return DRM_ERR(EINVAL); } - if (dev_priv->swaps_pending >= 100) { - DRM_DEBUG("Too many swaps queued\n"); - return DRM_ERR(EBUSY); - } - DRM_COPY_FROM_USER_IOCTL(swap, (drm_i915_vblank_swap_t __user *) data, sizeof(swap)); @@ -461,6 +456,11 @@ int i915_vblank_swap(DRM_IOCTL_ARGS) spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags); + if (dev_priv->swaps_pending >= 100) { + DRM_DEBUG("Too many swaps queued\n"); + return DRM_ERR(EBUSY); + } + vbl_swap = drm_calloc(1, sizeof(vbl_swap), DRM_MEM_DRIVER); if (!vbl_swap) {