diff options
| author | Eric Anholt <eric@anholt.net> | 2008-07-28 15:17:21 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-07-28 23:12:26 -0700 |
| commit | 1d2bb68d28fe39746299ee8ddb664a62de839b0c (patch) | |
| tree | f1f89d0ea693a0520f4e856296c4d3d4d721501f /bsd-core/drm_bufs.c | |
| parent | 487c42bd42d93304278abce03b36c935bdc83284 (diff) | |
| parent | 514c05cebe31a62f827a76f348d35596bef97811 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'bsd-core/drm_bufs.c')
| -rw-r--r-- | bsd-core/drm_bufs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bsd-core/drm_bufs.c b/bsd-core/drm_bufs.c index 3508331a..c793634b 100644 --- a/bsd-core/drm_bufs.c +++ b/bsd-core/drm_bufs.c @@ -832,12 +832,12 @@ int drm_addbufs_sg(struct drm_device *dev, drm_buf_desc_t *request) if (request->count < 0 || request->count > 4096) return EINVAL; - DRM_SPINLOCK(&dev->dma_lock); - order = drm_order(request->size); if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return EINVAL; + DRM_SPINLOCK(&dev->dma_lock); + /* No more allocations after first buffer-using ioctl. */ if (dev->buf_use != 0) { DRM_SPINUNLOCK(&dev->dma_lock); |