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

 #define PROT_READ       0x1             /* page can be read */
 #define PROT_WRITE      0x2             /* page can be written */
-#define MAP_SHARED      0x01            /* Share changes */
-#undef mb
-#undef rmb
-#undef wmb
-#define mb() asm volatile("mfence")
-#define rmb() asm volatile ("lfence")
+#define MAP_SHARED      0x01            /* Share changes */
 #define wmb() asm volatile ("sfence")
 #define MAX_ERRNO       4095
-#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
-#define I915_EXEC_CONSTANTS_MASK        (3<<6)
-#define I915_EXEC_CONSTANTS_REL_GENERAL (0<<6) /* default */
+#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
 #define I915_EXEC_CONSTANTS_ABSOLUTE    (1<<6)
 #define I915_EXEC_CONSTANTS_REL_SURFACE (2<<6) /* gen4/5 only */
 	int ret;
 	if (args->size == 0)
-		return 0;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
+		return 0;
 	struct drm_i915_gem_object *obj;
 	uint32_t read_domains = args->read_domains;
 	uint32_t write_domain = args->write_domain;
 	int ret;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
-     }
 	/* Only handle setting domains to types used by the CPU. */
 	if (write_domain & I915_GEM_GPU_DOMAINS)
 		return -EINVAL;
+{
 	struct drm_i915_gem_sw_finish *args = data;
 	struct drm_i915_gem_object *obj;
 	int ret = 0;
-    if(args->handle == -2)
-    {
-       printf("%s handle %d\n", __FUNCTION__, args->handle);
-       return 0;
-    }
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
 		return ret;
 i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
 		    struct drm_file *file)
+{
 	struct drm_i915_gem_mmap *args = data;
 	struct drm_gem_object *obj;
-	unsigned long addr = 0;
+	unsigned long addr;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
-     }
 	obj = drm_gem_object_lookup(dev, file, args->handle);
 	if (obj == NULL)
 	 * fence register that can contain the object.
 	 */
 	return i915_gem_get_gtt_size(dev, size, tiling_mode);
+}
-/**
- * i915_gem_get_unfenced_gtt_alignment - return required GTT alignment for an
- *					 unfenced object
- * @dev: the device
- * @size: size of the object
- * @tiling_mode: tiling mode of the object
- *
- * Return the required GTT alignment for an object, only taking into account
- * unfenced tiled surface requirements.
- */
-uint32_t
-i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev,
-				    uint32_t size,
-				    int tiling_mode)
-{
-	/*
-	 * Minimum alignment is 4k (GTT page size) for sane hw.
-	 */
-	if (INTEL_INFO(dev)->gen >= 4 || IS_G33(dev) ||
-	    tiling_mode == I915_TILING_NONE)
-		return 4096;
-	/* Previous hardware however needs to be aligned to a power-of-two
-	 * tile height. The simplest method for determining this is to reuse
-	 * the power-of-tile object size.
-	 */
 	return i915_gem_get_gtt_size(dev, size, tiling_mode);
 int
 	int ret;
 	if (obj->pages)
+		return 0;
+	if (obj->madv != I915_MADV_WILLNEED) {
+		DRM_ERROR("Attempting to obtain a purgeable object\n");
+		return -EINVAL;
 		return 0;
 	BUG_ON(obj->pages_pin_count);
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
-		return ret;
-    if(args->bo_handle == -2)
-    {
-        obj = get_fb_obj();
-        drm_gem_object_reference(&obj->base);
 		return ret;
     else
 	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->bo_handle));
 	if (&obj->base == NULL) {
 		mutex_unlock(&dev->struct_mutex);
+{
 	struct drm_i915_gem_caching *args = data;
 	struct drm_i915_gem_object *obj;
 	int ret;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
-     }
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
 		return ret;
 	struct drm_i915_gem_caching *args = data;
 	struct drm_i915_gem_object *obj;
 	enum i915_cache_level level;
 	int ret;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
-     }
 	switch (args->caching) {
 	case I915_CACHING_NONE:
 		level = I915_CACHE_NONE;
 		break;
+{
 	struct drm_i915_gem_pin *args = data;
 	struct drm_i915_gem_object *obj;
 	int ret;
-     if(args->handle == -2)
-     {
-        printf("%s handle %d\n", __FUNCTION__, args->handle);
-        return 0;
-     }
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
 		return ret;
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
-		return ret;
-    if(args->handle == -2)
-    {
-        obj = get_fb_obj();
-        drm_gem_object_reference(&obj->base);
 		return ret;
     else
 	obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
 	if (&obj->base == NULL) {
 		ret = -ENOENT;
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
-		return ret;
-    if(args->handle == -2)
-    {
-        obj = get_fb_obj();
-        drm_gem_object_reference(&obj->base);
 		return ret;
     else
         obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
 	if (&obj->base == NULL) {
 		ret = -ENOENT;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_gem.c – Rev 4389 → 4392