aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-01-04 13:57:57 -0500
committerEric Anholt <eric@anholt.net>2010-01-06 12:40:11 -0500
commite3d8affb0d2d95f2da61e30ce86b33177feb91e8 (patch)
treead420c55427985894e5d86cd90c3c25ae287626b
parent9ea8d05932c082a7ccbd9dc2e10687c88a70bd13 (diff)
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>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
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 0330c3aa8032..21950ef987c7 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)
2582 bool retry_alloc = false; 2582 bool retry_alloc = false;
2583 int ret; 2583 int ret;
2584 2584
2585 if (dev_priv->mm.suspended)
2586 return -EBUSY;
2587
2588 if (obj_priv->madv != I915_MADV_WILLNEED) { 2585 if (obj_priv->madv != I915_MADV_WILLNEED) {
2589 DRM_ERROR("Attempting to bind a purgeable object\n"); 2586 DRM_ERROR("Attempting to bind a purgeable object\n");
2590 return -EINVAL; 2587 return -EINVAL;