diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-05-24 14:11:20 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-05-25 04:10:40 -0400 |
commit | 31d8d651eb646498413abe5f17acc7fa2b68b2fc (patch) | |
tree | caec0c2329981b88f31eb03f42c0a9b116c70113 /drivers/gpu/drm/i915/i915_gem.c | |
parent | bed1ea95a38bf7a54fd3229edcd3871a18ca98c0 (diff) |
drm/i915: Remove the error message for unbinding 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-and-tested-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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 1d4b51c5387..465e775b8cd 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -2033,10 +2033,8 @@ i915_gem_object_unbind(struct drm_i915_gem_object *obj) | |||
2033 | if (obj->gtt_space == NULL) | 2033 | if (obj->gtt_space == NULL) |
2034 | return 0; | 2034 | return 0; |
2035 | 2035 | ||
2036 | if (obj->pin_count != 0) { | 2036 | if (obj->pin_count) |
2037 | DRM_ERROR("Attempting to unbind pinned buffer\n"); | 2037 | return -EBUSY; |
2038 | return -EINVAL; | ||
2039 | } | ||
2040 | 2038 | ||
2041 | ret = i915_gem_object_finish_gpu(obj); | 2039 | ret = i915_gem_object_finish_gpu(obj); |
2042 | if (ret) | 2040 | if (ret) |