WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_gem_execbuffer.c

 static int
 i915_gem_execbuffer_relocate_object(struct drm_i915_gem_object *obj,
 				    struct eb_objects *eb)
+{
 #define N_RELOC(x) ((x) / sizeof(struct drm_i915_gem_relocation_entry))
-	struct drm_i915_gem_relocation_entry stack_reloc[N_RELOC(512)];
+	struct drm_i915_gem_relocation_entry stack_reloc[N_RELOC(64)];
 	struct drm_i915_gem_relocation_entry __user *user_relocs;
 	struct drm_i915_gem_exec_object2 *entry = obj->exec_entry;
 	int remain, ret;
 	struct drm_i915_gem_exec_object2 *entry = obj->exec_entry;
 	bool has_fenced_gpu_access = INTEL_INFO(ring->dev)->gen < 4;
 	bool need_fence, need_mappable;
 	int ret;
+//    ENTER();
 	need_fence =
 		has_fenced_gpu_access &&
 		entry->flags & EXEC_OBJECT_NEEDS_FENCE &&
 		obj->tiling_mode != I915_TILING_NONE;
 	need_mappable = need_fence || need_reloc_mappable(obj);
+	ret = i915_gem_object_pin(obj, entry->alignment, need_mappable, false);
+	if (ret)
 	ret = i915_gem_object_pin(obj, entry->alignment, need_mappable, false);
+        FAIL();
-	if (ret)
+		return ret;
-		return ret;
+    };
 	entry->flags |= __EXEC_OBJECT_HAS_PIN;
+	if (has_fenced_gpu_access) {
+		if (entry->flags & EXEC_OBJECT_NEEDS_FENCE) {
-	if (has_fenced_gpu_access) {
+			ret = i915_gem_object_get_fence(obj);
+			if (ret)
 		if (entry->flags & EXEC_OBJECT_NEEDS_FENCE) {
-			ret = i915_gem_object_get_fence(obj);
+                FAIL();
-			if (ret)
+				return ret;
 		obj->has_aliasing_ppgtt_mapping = 1;
+	}
+	entry->offset = obj->gtt_offset;
 //    LEAVE();
 	entry->offset = obj->gtt_offset;
 	return 0;
+}
 	struct drm_i915_gem_object *obj;
 	struct list_head ordered_objects;
 	bool has_fenced_gpu_access = INTEL_INFO(ring->dev)->gen < 4;
 	int retry;
+//    ENTER();
 	INIT_LIST_HEAD(&ordered_objects);
 	while (!list_empty(objects)) {
 		struct drm_i915_gem_exec_object2 *entry;
 err:		/* Decrement pin count for bound objects */
 		list_for_each_entry(obj, objects, exec_list)
 			i915_gem_execbuffer_unreserve_object(obj);
+		if (ret != -ENOSPC || retry++)
+        {
-		if (ret != -ENOSPC || retry++)
+//            LEAVE();
+			return ret;
-			return ret;
+        };
 //       ret = i915_gem_evict_everything(ring->dev);
 		if (ret)
 		total += exec[i].relocation_count;
     reloc_offset = malloc(count * sizeof(*reloc_offset));
     reloc = malloc(total * sizeof(*reloc));
 	if (reloc == NULL || reloc_offset == NULL) {
-        free(reloc);
+        kfree(reloc);
-        free(reloc_offset);
+        kfree(reloc_offset);
 		mutex_lock(&dev->struct_mutex);
 		return -ENOMEM;
+	}
 	/* reacquire the objects */
 	eb_reset(eb);
 	for (i = 0; i < count; i++) {
+        if(exec[i].handle == -2)
         if(exec[i].handle == -2)
+            obj = get_fb_obj();
+            drm_gem_object_reference(&obj->base);
             obj = get_fb_obj();
         else
             obj = to_intel_bo(drm_gem_object_lookup(dev, file,
                               exec[i].handle));
 		if (&obj->base == NULL) {
 	 * having buffers reserved in the aperture and so causing spurious
 	 * ENOSPC for random operations.
 	 */
 err:
-    free(reloc);
+    kfree(reloc);
-    free(reloc_offset);
+    kfree(reloc_offset);
 	return ret;
+}
 	u32 flags;
 	int ret, mode, i;
 	if (!i915_gem_check_execbuffer(args)) {
+		DRM_DEBUG("execbuf with invalid offset/length\n");
-		DRM_DEBUG("execbuf with invalid offset/length\n");
+        FAIL();
 		return -EINVAL;
+	}
+	ret = validate_exec_list(exec, args->buffer_count);
+	if (ret)
 	ret = validate_exec_list(exec, args->buffer_count);
+        FAIL();
-	if (ret)
+		return ret;
-		return ret;
+    };
 	flags = 0;
 	case I915_EXEC_BSD:
 		ring = &dev_priv->ring[VCS];
 		if (ctx_id != 0) {
 			DRM_DEBUG("Ring %s doesn't support contexts\n",
 				  ring->name);
+            FAIL();
 			return -EPERM;
+		}
 		break;
 	case I915_EXEC_BLT:
 		ring = &dev_priv->ring[BCS];
 	INIT_LIST_HEAD(&objects);
 	for (i = 0; i < args->buffer_count; i++) {
 		struct drm_i915_gem_object *obj;
+        if(exec[i].handle == -2)
         if(exec[i].handle == -2)
+            obj = get_fb_obj();
+            drm_gem_object_reference(&obj->base);
             obj = get_fb_obj();
         else
             obj = to_intel_bo(drm_gem_object_lookup(dev, file,
+                              exec[i].handle));
+//        printf("%s object %p handle %d\n", __FUNCTION__, obj, exec[i].handle);
                               exec[i].handle));
 		if (&obj->base == NULL) {
 			DRM_DEBUG("Invalid object handle %d at index %d\n",
 				   exec[i].handle, i);
 			/* prevent error path from reading uninitialized data */
 						flags);
 		if (ret)
 			goto err;
+	}
+	trace_i915_gem_ring_dispatch(ring, intel_ring_get_seqno(ring), flags);
-//   i915_gem_execbuffer_move_to_active(&objects, ring);
+	i915_gem_execbuffer_move_to_active(&objects, ring);
-//   i915_gem_execbuffer_retire_commands(dev, file, ring);
-    ring->gpu_caches_dirty = true;
-    intel_ring_flush_all_caches(ring);
+	i915_gem_execbuffer_retire_commands(dev, file, ring);
 err:
 	eb_destroy(eb);
 	mutex_unlock(&dev->struct_mutex);
+pre_mutex_err:
+	kfree(cliprects);
 pre_mutex_err:
 	kfree(cliprects);
-	return ret;
 	return ret;
+}
 int
 i915_gem_execbuffer2(struct drm_device *dev, void *data,
 		     struct drm_file *file)
+{
+	struct drm_i915_gem_execbuffer2 *args = data;
+	struct drm_i915_gem_exec_object2 *exec2_list = NULL;
-	struct drm_i915_gem_execbuffer2 *args = data;
+	int ret;
 	struct drm_i915_gem_exec_object2 *exec2_list = NULL;
-	int ret;
+//    ENTER();
 	if (args->buffer_count < 1 ||
-	if (args->buffer_count < 1 ||
+	    args->buffer_count > UINT_MAX / sizeof(*exec2_list)) {
-	    args->buffer_count > UINT_MAX / sizeof(*exec2_list)) {
-		DRM_DEBUG("execbuf2 with %d buffers\n", args->buffer_count);
-		return -EINVAL;
+		DRM_DEBUG("execbuf2 with %d buffers\n", args->buffer_count);
+        FAIL();
+		return -EINVAL;
+	}
     exec2_list = malloc(sizeof(*exec2_list)*args->buffer_count);
-    exec2_list = kmalloc(sizeof(*exec2_list)*args->buffer_count, 0);
+//	if (exec2_list == NULL)
+//		exec2_list = drm_malloc_ab(sizeof(*exec2_list),
-	if (exec2_list == NULL)
+//					   args->buffer_count);
-        exec2_list = malloc(sizeof(*exec2_list) * args->buffer_count);
+	if (exec2_list == NULL) {
-	if (exec2_list == NULL) {
+		DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
-		DRM_DEBUG("Failed to allocate exec list for %d buffers\n",
+			  args->buffer_count);
-			  args->buffer_count);
+        FAIL();
 		return -ENOMEM;
+	}
 	ret = copy_from_user(exec2_list,
 			     (struct drm_i915_relocation_entry __user *)
 			     (uintptr_t) args->buffers_ptr,
+			     sizeof(*exec2_list) * args->buffer_count);
-			     sizeof(*exec2_list) * args->buffer_count);
+	if (ret != 0) {
-	if (ret != 0) {
+		DRM_DEBUG("copy %d exec entries failed %d\n",
-		DRM_DEBUG("copy %d exec entries failed %d\n",
+			  args->buffer_count, ret);
-			  args->buffer_count, ret);
+        kfree(exec2_list);
 				  "back to user (%d)\n",
 				  args->buffer_count, ret);
+		}
+	}
+    kfree(exec2_list);
+//    LEAVE();
     free(exec2_list);
 	return ret;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_gem_execbuffer.c – Rev 3263 → 3266