diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-01-04 18:57:57 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-01-06 09:40:11 -0800 |
| commit | e3d8affb0d2d95f2da61e30ce86b33177feb91e8 (patch) | |
| tree | ad420c55427985894e5d86cd90c3c25ae287626b /drivers/gpu | |
| parent | 9ea8d05932c082a7ccbd9dc2e10687c88a70bd13 (diff) | |
| download | op-kernel-dev-e3d8affb0d2d95f2da61e30ce86b33177feb91e8.zip op-kernel-dev-e3d8affb0d2d95f2da61e30ce86b33177feb91e8.tar.gz | |
drm/i915: Permit pinning whilst the device is 'suspended'
As pinning (allocating and binding GTT memory) does not actually invoke
GPU commands, it is safe, and indeed is attempted, during resumption
from suspension:
[drm:intel_init_clock_gating] *ERROR* failed to pin power context: -16
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reported-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: stable@kernel.org
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 0330c3a..21950ef 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2582,9 +2582,6 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) bool retry_alloc = false; int ret; - if (dev_priv->mm.suspended) - return -EBUSY; - if (obj_priv->madv != I915_MADV_WILLNEED) { DRM_ERROR("Attempting to bind a purgeable object\n"); return -EINVAL; |
