diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-02 15:20:52 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-02 15:21:17 +0100 |
| commit | ed3dab44a717a1a88470228b5e33f20de1e4ad0d (patch) | |
| tree | d316a94b3e09147b5e10726665dfbba78b8985f8 | |
| parent | 4e2fc5aee035c3059ca33dbcafc71dc5988d6b09 (diff) | |
sna: Adjust userptr structure for implicit padding
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/kgem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 9013e68c..c670dbbe 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -128,7 +128,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr) struct local_i915_gem_userptr { uint64_t user_ptr; - uint32_t user_size; + uint64_t user_size; uint32_t flags; #define I915_USERPTR_READ_ONLY (1<<0) #define I915_USERPTR_UNSYNCHRONIZED (1<<31) @@ -1482,6 +1482,7 @@ static void kgem_bo_free(struct kgem *kgem, struct kgem_bo *bo) if (IS_USER_MAP(bo->map)) { assert(bo->rq == NULL); + assert(!__kgem_busy(kgem, bo->handle)); assert(MAP(bo->map) != bo || bo->io || bo->flush); if (!(bo->io || bo->flush)) { DBG(("%s: freeing snooped base\n", __FUNCTION__)); |