diff options
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_irq.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index d88afdd0..158a91de 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -427,11 +427,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)); @@ -496,6 +491,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) {  | 
