Attachment 61905 Details for Bug 50075 – Error message begone.

[patch] Error message begone.

0001-drm-i915-Remove-the-error-message-for-unpinning-pinn.patch (text/plain), 1.29 KB, created by Chris Wilson on 2012-05-21 02:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2012-05-21 02:34:12 UTC

Size: 1.29 KB

patch

obsolete

>From ce2e7d5491fa09de9a6745b0900c782f145208af Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Mon, 21 May 2012 10:28:07 +0100
>Subject: [PATCH] drm/i915: Remove the error message for unpinning pinned
> buffers
>
>This is now used intentionally to prevent proliferation of is-pinned
>checks upon the inactive list following:
>
>commit 1b50247a8ddde4af5aaa0e6bc125615372ce6c16
>Author: Chris Wilson <chris@chris-wilson.co.uk>
>Date:   Tue Apr 24 15:47:30 2012 +0100
>
>    drm/i915: Remove the list of pinned inactive objects
>
>Reported-by: guang.a.yang@intel.com
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50075
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem.c |    6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 402726d..99f816c 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -2040,10 +2040,8 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj)
> 	if (obj->gtt_space == NULL)
> 		return 0;
> 
>-	if (obj->pin_count != 0) {
>-		DRM_ERROR("Attempting to unbind pinned buffer\n");
>-		return -EINVAL;
>-	}
>+	if (obj->pin_count)
>+		return -EBUSY;
> 
> 	ret = i915_gem_object_finish_gpu(obj);
> 	if (ret)
>-- 
>1.7.10
>

Actions: View | Splinter Review

Attachments on bug 50075: 61775 | 61863 | 61864 | 61903 | 61905

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.