| i915_gem.c (255013) | i915_gem.c (255426) |
|---|---|
| 1/*- 2 * Copyright �� 2008 Intel Corporation 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 38 unchanged lines hidden (view full) --- 47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 51 * SUCH DAMAGE. 52 */ 53 54#include <sys/cdefs.h> | 1/*- 2 * Copyright �� 2008 Intel Corporation 3 * 4 * Permission is hereby granted, free of charge, to any person obtaining a 5 * copy of this software and associated documentation files (the "Software"), 6 * to deal in the Software without restriction, including without limitation 7 * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 * and/or sell copies of the Software, and to permit persons to whom the --- 38 unchanged lines hidden (view full) --- 47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 51 * SUCH DAMAGE. 52 */ 53 54#include <sys/cdefs.h> |
| 55__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/i915_gem.c 255013 2013-08-28 23:59:38Z jkim $"); | 55__FBSDID("$FreeBSD: head/sys/dev/drm2/i915/i915_gem.c 255426 2013-09-09 18:11:59Z jhb $"); |
| 56 57#include <dev/drm2/drmP.h> 58#include <dev/drm2/drm.h> 59#include <dev/drm2/i915/i915_drm.h> 60#include <dev/drm2/i915/i915_drv.h> 61#include <dev/drm2/i915/intel_drv.h> 62#include <dev/drm2/i915/intel_ringbuffer.h> 63#include <sys/resourcevar.h> --- 1222 unchanged lines hidden (view full) --- 1286 error = ENOMEM; 1287 goto out; 1288 } 1289 PROC_UNLOCK(p); 1290 1291 addr = 0; 1292 vm_object_reference(obj->vm_obj); 1293 DRM_UNLOCK(dev); | 56 57#include <dev/drm2/drmP.h> 58#include <dev/drm2/drm.h> 59#include <dev/drm2/i915/i915_drm.h> 60#include <dev/drm2/i915/i915_drv.h> 61#include <dev/drm2/i915/intel_drv.h> 62#include <dev/drm2/i915/intel_ringbuffer.h> 63#include <sys/resourcevar.h> --- 1222 unchanged lines hidden (view full) --- 1286 error = ENOMEM; 1287 goto out; 1288 } 1289 PROC_UNLOCK(p); 1290 1291 addr = 0; 1292 vm_object_reference(obj->vm_obj); 1293 DRM_UNLOCK(dev); |
| 1294 rv = vm_map_find(map, obj->vm_obj, args->offset, &addr, args->size, | 1294 rv = vm_map_find(map, obj->vm_obj, args->offset, &addr, args->size, 0, |
| 1295 VMFS_OPTIMAL_SPACE, VM_PROT_READ | VM_PROT_WRITE, 1296 VM_PROT_READ | VM_PROT_WRITE, MAP_INHERIT_SHARE); 1297 if (rv != KERN_SUCCESS) { 1298 vm_object_deallocate(obj->vm_obj); 1299 error = -vm_mmap_to_errno(rv); 1300 } else { 1301 args->addr_ptr = (uint64_t)addr; 1302 } --- 2483 unchanged lines hidden --- | 1295 VMFS_OPTIMAL_SPACE, VM_PROT_READ | VM_PROT_WRITE, 1296 VM_PROT_READ | VM_PROT_WRITE, MAP_INHERIT_SHARE); 1297 if (rv != KERN_SUCCESS) { 1298 vm_object_deallocate(obj->vm_obj); 1299 error = -vm_mmap_to_errno(rv); 1300 } else { 1301 args->addr_ptr = (uint64_t)addr; 1302 } --- 2483 unchanged lines hidden --- |