From patchwork Fri Feb 14 13:01:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3652471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4FFF09F382 for ; Fri, 14 Feb 2014 13:02:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 731AE20225 for ; Fri, 14 Feb 2014 13:02:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 766DF2021E for ; Fri, 14 Feb 2014 13:01:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82683FB531; Fri, 14 Feb 2014 05:01:55 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 79652FB528 for ; Fri, 14 Feb 2014 05:01:53 -0800 (PST) Received: by mail-ea0-f173.google.com with SMTP id d10so5786403eaj.4 for ; Fri, 14 Feb 2014 05:01:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QrF3GNUauMv6aR94BI6k1cCN6Su4kZUYBJLBGCscxvM=; b=hWAzJaP7Oi8zTVJaWVACDB1StOPqsfb6Zm/yTyFx509HnqSG6LtRLamLsPiMcEvBM2 9TZME6lEeIlU7lm053EL0x4TAxfEbvF4kPBc6Gj+0W2n1ZlLGSylzZILy0DtvD4pYJmQ lItGpyBfb0y/ZLhfvCBRPph7gM9uqtuGryfOs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QrF3GNUauMv6aR94BI6k1cCN6Su4kZUYBJLBGCscxvM=; b=BmOvd/sHerjE4MkVQE8DbIwE2EmkwO9lN2/csTb6KMtxpUXQex9God3zXkIM/gbBlh eut8yn/orpt2fyTSESEuLHOeegfCwoSz+0pfolwQ1j7SsLd6uxa+7x94y6C4/vEaxPyT RiM8SVxPiTMMMM5kEBoYxFEV4LmYY16ksYr2OffXnhBUtcsGeFOhCfMrZqpMR9ratNlL TRtB4Yf6otnRMaOvkxHuxVvzQ26tWTqrTugr1Ud4SfLC42GdfNLc74DwNqJGilqyXqCv p7PGO4VMNE8VeQWHVBmR4WNbsDtbOaE8962o/rSS2J+QnVmWgxlKu4jsl21AxvjU09os LAgw== X-Gm-Message-State: ALoCoQlmUCsLBbAfp2X9wQHFgkxAat/wUsMHiQepiT+MPUV3rGONftfdXmKd/xin/u2OU15ALD/S X-Received: by 10.14.110.198 with SMTP id u46mr8976086eeg.20.1392382912731; Fri, 14 Feb 2014 05:01:52 -0800 (PST) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id j41sm19560682eeg.10.2014.02.14.05.01.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Feb 2014 05:01:51 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 14 Feb 2014 14:01:19 +0100 Message-Id: <1392382881-19073-10-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> References: <1392382881-19073-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Jani Nikula , Daniel Vetter , Ben Widawsky Subject: [Intel-gfx] [PATCH 09/11] drm/i915: Simplify i915_gem_object_ggtt_unpin X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Split out from Chris vma-bind rework. Jani wondered why this is save, and the reason is that i915_vma_unbind does all these checks, too. So they're redundant. Cc: Chris Wilson Cc: Ben Widawsky Cc: Jani Nikula Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++-- drivers/gpu/drm/i915/i915_gem.c | 20 -------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 112c45e71c3f..8e8a30b080f3 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2091,9 +2091,7 @@ int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj, struct i915_address_space *vm, uint32_t alignment, unsigned flags); -void i915_gem_object_ggtt_unpin(struct drm_i915_gem_object *obj); int __must_check i915_vma_unbind(struct i915_vma *vma); -int __must_check i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj); int i915_gem_object_put_pages(struct drm_i915_gem_object *obj); void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv); void i915_gem_release_mmap(struct drm_i915_gem_object *obj); @@ -2298,6 +2296,14 @@ i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj, return i915_gem_object_pin(obj, obj_to_ggtt(obj), alignment, flags | PIN_GLOBAL); } +static inline int +i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj) +{ + return i915_vma_unbind(i915_gem_obj_to_ggtt(obj)); +} + +void i915_gem_object_ggtt_unpin(struct drm_i915_gem_object *obj); + /* i915_gem_context.c */ #define ctx_to_ppgtt(ctx) container_of((ctx)->vm, struct i915_hw_ppgtt, base) int __must_check i915_gem_context_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b3a15c9fa034..10450f196913 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2766,26 +2766,6 @@ int i915_vma_unbind(struct i915_vma *vma) return 0; } -/** - * Unbinds an object from the global GTT aperture. - */ -int -i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj) -{ - struct drm_i915_private *dev_priv = obj->base.dev->dev_private; - struct i915_address_space *ggtt = &dev_priv->gtt.base; - - if (!i915_gem_obj_ggtt_bound(obj)) - return 0; - - if (i915_gem_obj_to_ggtt(obj)->pin_count) - return -EBUSY; - - BUG_ON(obj->pages == NULL); - - return i915_vma_unbind(i915_gem_obj_to_vma(obj, ggtt)); -} - int i915_gpu_idle(struct drm_device *dev) { drm_i915_private_t *dev_priv = dev->dev_private;