Attachment 39995 Details for Bug 31286 – drop map/fence distinction

[patch] drop map/fence distinction

map-an-fence.patch (text/plain), 4.41 KB, created by Daniel Vetter on 2010-11-02 14:26:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Vetter

Created: 2010-11-02 14:26:02 UTC

Size: 4.41 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 90e4c19..058455f 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1077,7 +1077,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
> 	else if (obj_priv->tiling_mode == I915_TILING_NONE &&
> 		 obj_priv->gtt_space &&
> 		 obj->write_domain != I915_GEM_DOMAIN_CPU) {
>-		ret = i915_gem_object_pin(obj, 0, true, false);
>+		ret = i915_gem_object_pin(obj, 0, true, true);
> 		if (ret)
> 			goto out;
> 
>@@ -3551,7 +3551,7 @@ i915_gem_execbuffer_pin(struct drm_device *dev,
> 			ret = i915_gem_object_pin(&obj->base,
> 						  entry->alignment,
> 						  need_mappable,
>-						  need_fence);
>+						  need_mappable);
> 			if (ret)
> 				break;
> 
>@@ -4253,7 +4253,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
> 	obj_priv->pin_filp = file_priv;
> 	if (obj_priv->user_pin_count == 1) {
> 		ret = i915_gem_object_pin(obj, args->alignment,
>-					  true, obj_priv->tiling_mode);
>+					  true, true);
> 		if (ret)
> 			goto out;
> 	}
>@@ -4572,7 +4572,7 @@ i915_gem_init_pipe_control(struct drm_device *dev)
> 	obj_priv = to_intel_bo(obj);
> 	obj_priv->agp_type = AGP_USER_CACHED_MEMORY;
> 
>-	ret = i915_gem_object_pin(obj, 4096, true, false);
>+	ret = i915_gem_object_pin(obj, 4096, true, true);
> 	if (ret)
> 		goto err_unref;
> 
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 33c178c..15fd27a 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -1461,8 +1461,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev,
> 		BUG();
> 	}
> 
>-	ret = i915_gem_object_pin(obj, alignment,
>-				  !pipelined, obj_priv->tiling_mode);
>+	ret = i915_gem_object_pin(obj, alignment, true, true);
> 	if (ret)
> 		return ret;
> 
>@@ -4354,7 +4353,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> 	/* we only need to pin inside GTT if cursor is non-phy */
> 	mutex_lock(&dev->struct_mutex);
> 	if (!dev_priv->info->cursor_needs_physical) {
>-		ret = i915_gem_object_pin(bo, PAGE_SIZE, true, false);
>+		ret = i915_gem_object_pin(bo, PAGE_SIZE, true, true);
> 		if (ret) {
> 			DRM_ERROR("failed to pin cursor bo\n");
> 			goto fail_locked;
>@@ -5518,7 +5517,7 @@ intel_alloc_context_page(struct drm_device *dev)
> 	}
> 
> 	mutex_lock(&dev->struct_mutex);
>-	ret = i915_gem_object_pin(ctx, 4096, false, false);
>+	ret = i915_gem_object_pin(ctx, 4096, true, true);
> 	if (ret) {
> 		DRM_ERROR("failed to pin power context: %d\n", ret);
> 		goto err_unref;
>diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
>index 659f834..f7eae1b 100644
>--- a/drivers/gpu/drm/i915/intel_overlay.c
>+++ b/drivers/gpu/drm/i915/intel_overlay.c
>@@ -781,7 +781,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
> 	if (ret != 0)
> 		return ret;
> 
>-	ret = i915_gem_object_pin(new_bo, PAGE_SIZE, false, false);
>+	ret = i915_gem_object_pin(new_bo, PAGE_SIZE, true, true);
> 	if (ret != 0)
> 		return ret;
> 
>@@ -1425,7 +1425,7 @@ void intel_setup_overlay(struct drm_device *dev)
>                 }
> 		overlay->flip_addr = overlay->reg_bo->phys_obj->handle->busaddr;
> 	} else {
>-		ret = i915_gem_object_pin(reg_bo, PAGE_SIZE, true, false);
>+		ret = i915_gem_object_pin(reg_bo, PAGE_SIZE, true, true);
> 		if (ret) {
>                         DRM_ERROR("failed to pin overlay register bo\n");
>                         goto out_free_bo;
>diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
>index 85071570..3d0a731 100644
>--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
>+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
>@@ -547,7 +547,7 @@ static int init_status_page(struct intel_ring_buffer *ring)
> 	obj_priv = to_intel_bo(obj);
> 	obj_priv->agp_type = AGP_USER_CACHED_MEMORY;
> 
>-	ret = i915_gem_object_pin(obj, 4096, true, false);
>+	ret = i915_gem_object_pin(obj, 4096, true, true);
> 	if (ret != 0) {
> 		goto err_unref;
> 	}
>@@ -602,7 +602,7 @@ int intel_init_ring_buffer(struct drm_device *dev,
> 
> 	ring->gem_object = obj;
> 
>-	ret = i915_gem_object_pin(obj, PAGE_SIZE, true, false);
>+	ret = i915_gem_object_pin(obj, PAGE_SIZE, true, true);
> 	if (ret)
> 		goto err_unref;
> 
>@@ -906,7 +906,7 @@ static int blt_ring_init(struct intel_ring_buffer *ring)
> 		if (obj == NULL)
> 			return -ENOMEM;
> 
>-		ret = i915_gem_object_pin(&obj->base, 4096, true, false);
>+		ret = i915_gem_object_pin(&obj->base, 4096, true, true);
> 		if (ret) {
> 			drm_gem_object_unreference(&obj->base);
> 			return ret;

Actions: View | Splinter Review

Attachments on bug 31286: 39995

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.