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

 #include "drmP.h"
 #include "drm.h"
 #include "i915_drm.h"
 #include "i915_drv.h"
-//#include "i915_trace.h"
+#include "i915_trace.h"
 #include "intel_drv.h"
 //#include
 #include
 //#include
 	i915_gem_do_init(dev, args->gtt_start, args->gtt_end, args->gtt_end);
 	mutex_unlock(&dev->struct_mutex);
 	return 0;
+}
 #endif
 int
 i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
 			    struct drm_file *file)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_gem_get_aperture *args = data;
-	struct drm_i915_gem_object *obj;
-	size_t pinned;
 	struct drm_i915_gem_object *obj;
-	if (!(dev->driver->driver_features & DRIVER_GEM))
+	size_t pinned;
 		return -ENODEV;
 	args->aper_available_size = args->aper_size - pinned;
 	return 0;
 }
+#if 0
 static int
-i915_gem_create(struct drm_file *file,
+int i915_gem_create(struct drm_file *file,
 		struct drm_device *dev,
 		uint64_t size,
 		uint32_t *handle_p)
 		return ret;
+	}
 	/* drop reference from allocate - handle holds it now */
+	drm_gem_object_unreference(&obj->base);
-	drm_gem_object_unreference(&obj->base);
+	trace_i915_gem_object_create(obj);
 	*handle_p = handle;
 i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
+{
 	int page_count = obj->base.size / PAGE_SIZE;
 	int i;
-    ENTER();
 	BUG_ON(obj->madv == __I915_MADV_PURGED);
+	}
 	obj->dirty = 0;
     free(obj->pages);
-	obj->pages = NULL;
-    LEAVE();
+	obj->pages = NULL;
+}
 void
 	if ((obj->base.read_domains & I915_GEM_DOMAIN_GTT) == 0)
 		return;
 	old_read_domains = obj->base.read_domains;
+	old_write_domain = obj->base.write_domain;
 	old_write_domain = obj->base.write_domain;
 	obj->base.read_domains &= ~I915_GEM_DOMAIN_GTT;
+	obj->base.write_domain &= ~I915_GEM_DOMAIN_GTT;
+	trace_i915_gem_object_change_domain(obj,
-	obj->base.write_domain &= ~I915_GEM_DOMAIN_GTT;
+					    old_read_domains,
 					    old_write_domain);
+}
 /**
  * Unbinds an object from the GTT aperture.
  */
 int
-i915_gem_object_unbind(struct drm_i915_gem_object *obj)
 i915_gem_object_unbind(struct drm_i915_gem_object *obj)
 	int ret = 0;
 	int ret = 0;
     ENTER();
 	/* release the fence reg _after_ flushing */
 	ret = i915_gem_object_put_fence(obj);
 	if (ret == -ERESTARTSYS)
 		return ret;
 	trace_i915_gem_object_unbind(obj);
 	i915_gem_gtt_unbind_object(obj);
 	obj->gtt_offset = 0;
 	if (i915_gem_object_is_purgeable(obj))
-		i915_gem_object_truncate(obj);
 		i915_gem_object_truncate(obj);
     LEAVE();
 	return ret;
+}
 	int ret;
 	if (((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) == 0)
+		return 0;
 		return 0;
 	trace_i915_gem_ring_flush(ring, invalidate_domains, flush_domains);
 	mappable =
 		obj->gtt_offset + obj->base.size <= dev_priv->mm.gtt_mappable_end;
+	obj->map_and_fenceable = mappable && fenceable;
 	obj->map_and_fenceable = mappable && fenceable;
 	trace_i915_gem_object_bind(obj, map_and_fenceable);
 	return 0;
+}
 	wmb();
 	old_write_domain = obj->base.write_domain;
+	obj->base.write_domain = 0;
+	trace_i915_gem_object_change_domain(obj,
-	obj->base.write_domain = 0;
+					    obj->base.read_domains,
 					    old_write_domain);
+}
 	i915_gem_clflush_object(obj);
 	intel_gtt_chipset_flush();
 	old_write_domain = obj->base.write_domain;
 	obj->base.write_domain = 0;
+	trace_i915_gem_object_change_domain(obj,
+					    obj->base.read_domains,
 					    old_write_domain);
+}
 /**
 		obj->base.read_domains = I915_GEM_DOMAIN_GTT;
 		obj->base.write_domain = I915_GEM_DOMAIN_GTT;
 		obj->dirty = 1;
+	}
+	trace_i915_gem_object_change_domain(obj,
+					    old_read_domains,
+					    old_write_domain);
 	return 0;
+}
 		old_write_domain = obj->base.write_domain;
 		obj->base.read_domains = I915_GEM_DOMAIN_CPU;
+		obj->base.write_domain = I915_GEM_DOMAIN_CPU;
+		trace_i915_gem_object_change_domain(obj,
-		obj->base.write_domain = I915_GEM_DOMAIN_CPU;
+						    old_read_domains,
 						    old_write_domain);
+    }
 	 * the domain values for our changes.
 	 */
 	BUG_ON((obj->base.write_domain & ~I915_GEM_DOMAIN_GTT) != 0);
 	obj->base.read_domains |= I915_GEM_DOMAIN_GTT;
+	trace_i915_gem_object_change_domain(obj,
+					    old_read_domains,
 					    old_write_domain);
 	return 0;
 	if (write) {
 		obj->base.read_domains = I915_GEM_DOMAIN_CPU;
 		obj->base.write_domain = I915_GEM_DOMAIN_CPU;
+	}
+	trace_i915_gem_object_change_domain(obj,
+					    old_read_domains,
 					    old_write_domain);
 	return 0;
+{
 	struct drm_device *dev = obj->base.dev;
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	int ret;
-    ENTER();
 	ret = i915_gem_object_unbind(obj);
 	if (ret == -ERESTARTSYS) {
 		list_move(&obj->mm_list,
 			  &dev_priv->mm.deferred_free_list);
 		return;
+	}
 	trace_i915_gem_object_destroy(obj);
 //	if (obj->base.map_list.map)
 //		drm_gem_free_mmap_offset(&obj->base);
 	drm_gem_object_release(&obj->base);
-	i915_gem_info_remove_obj(dev_priv, obj->base.size);
 	i915_gem_info_remove_obj(dev_priv, obj->base.size);
 	kfree(obj->page_cpu_valid);
-	kfree(obj->bit_17);
+	kfree(obj->page_cpu_valid);
-	kfree(obj);
+	kfree(obj->bit_17);
-    LEAVE();
+	kfree(obj);
-}
+}
 void i915_gem_free_object(struct drm_gem_object *gem_obj)
 void i915_gem_free_object(struct drm_gem_object *gem_obj)
 	struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
-	struct drm_device *dev = obj->base.dev;
+	struct drm_i915_gem_object *obj = to_intel_bo(gem_obj);
-    ENTER();
+	struct drm_device *dev = obj->base.dev;
 int
 i915_gem_init_ringbuffer(struct drm_device *dev)
+{
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	int ret;
-    ENTER();
 	ret = intel_init_render_ring_buffer(dev);
 	if (ret)
 		return ret;
 		if (ret)
 			goto cleanup_bsd_ring;
+	}
 	dev_priv->next_seqno = 1;
     LEAVE();
 	return 0;
 cleanup_bsd_ring:

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_gem.c – Rev 2344 → 2351