From patchwork Mon Jan 4 18:57:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 70697 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04IwAoE002823 for ; Mon, 4 Jan 2010 18:58:10 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D36CD9EB53; Mon, 4 Jan 2010 10:58:09 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fmsmga101.fm.intel.com (mga05.intel.com [192.55.52.89]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A2AC9E74B for ; Mon, 4 Jan 2010 10:58:06 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 04 Jan 2010 10:57:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,499,1257148800"; d="scan'208";a="761197607" Received: from unknown (HELO localhost.localdomain) ([10.255.17.78]) by fmsmga001.fm.intel.com with ESMTP; 04 Jan 2010 10:57:56 -0800 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Jan 2010 18:57:57 +0000 Message-Id: <1262631479-10949-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.6.5.7 In-Reply-To: <1262631479-10949-1-git-send-email-chris@chris-wilson.co.uk> References: <1262631479-10949-1-git-send-email-chris@chris-wilson.co.uk> Cc: stable@kernel.org Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Permit pinning whilst the device is 'suspended' X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org 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;