From patchwork Wed Apr 20 18:42:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8894041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8546BBF29F for ; Wed, 20 Apr 2016 18:42:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91E2F20254 for ; Wed, 20 Apr 2016 18:42:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BEA5820121 for ; Wed, 20 Apr 2016 18:42:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AFA86EAD2; Wed, 20 Apr 2016 18:42:55 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7424D6EACF for ; Wed, 20 Apr 2016 18:42:45 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r12so5127231wme.0 for ; Wed, 20 Apr 2016 11:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ef3Gd9Ny1WbDQyCJWB8LSrR9vNk+Bf2V7SgD/lUFnr0=; b=zuuCYo3FKuewSz9kRJWX9Q0AJDvlgqXcldfQmqPuTkJ1LMv8KSiM6mqq49yvmQzjKu VlFHzZzH6YgFIDDmVYJN2Zt1IqgV0t48cIorZl80o0js3gKzftQsJV2mfmPW0tOXrlUp NDBsHBAYHSPkMSQ0VNGO89LA9eeuIirVr+AxA63jJHKyt71akagqLyNhowq2GJha53Ig P83X2n+ySh6Y7E6l3w+v9SJJ+S1xf7hT3FErgF4aJqznwtg0noiZQdwEdD8KnV2tWz2P B/rVkrqeU6w+XaiJAWIfxEHWJOLV0VPoHoTZonN4n+QHwGHpIVR3062gZsaRfpvHTZpk TGsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Ef3Gd9Ny1WbDQyCJWB8LSrR9vNk+Bf2V7SgD/lUFnr0=; b=NkK7xYieYyJ+7ShU0CK2brCsL6N8qXgp9BcNV4AnNCOvqojaJCXpk//zKnErSqLvjK Fs+mgoaaw7cPsxsQIShu/G8A+fJG+d6D89e7c9LeGeeBZ7nNIjl7BFF0Q88PuGHE5WCX Zt/LMJoj8Ter+1mZZboaycXILuWOkamWyZOk0Wu970edBouXbFj9KRc0FoDLMdlwK1Zy eQxX0TF71qvTtC7cUQVqwWbj7tBSgT1Eetdef3wfbLpx6/F+WNUEM3FmKnZqhosioLlI swxB0KxEqEwKKtb770QDkvLM9kwUlIQ/PXOlxmg61vcWboU02ayNIIBeFm38aLrlsnfF IpkQ== X-Gm-Message-State: AOPr4FWTAi+914WWYnz9QwQ0rihFJVr7mrmmI7yCMJvEUEq5Rja8QiG9ddhUY7r0DSMPQw== X-Received: by 10.28.156.195 with SMTP id f186mr5216013wme.74.1461177763868; Wed, 20 Apr 2016 11:42:43 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id f8sm6934510wjm.13.2016.04.20.11.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 11:42:42 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Apr 2016 19:42:14 +0100 Message-Id: <1461177750-20187-4-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461177750-20187-1-git-send-email-chris@chris-wilson.co.uk> References: <1461177750-20187-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 03/19] drm/i915: Introduce i915_vm_to_ggtt() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 In a couple of places, we have an i915_address_space that we know is really an i915_ggtt that we want to use. Create an inline helper to convert from the i915_address_space subclass into its container. Signed-off-by: Chris Wilson Cc: Joonas Lahtinen Cc: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index eebdb28acfa9..1b696a13a727 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -93,6 +93,13 @@ * */ +static inline struct i915_ggtt * +i915_vm_to_ggtt(struct i915_address_space *vm) +{ + GEM_BUG_ON(!i915_is_ggtt(vm)); + return container_of(vm, struct i915_ggtt, base); +} + static int i915_get_ggtt_vma_pages(struct i915_vma *vma); @@ -2359,7 +2366,7 @@ static void gen8_ggtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level level, u32 unused) { struct drm_i915_private *dev_priv = to_i915(vm->dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; + struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm); unsigned first_entry = start >> PAGE_SHIFT; gen8_pte_t __iomem *gtt_entries = (gen8_pte_t __iomem *)ggtt->gsm + first_entry; @@ -2437,7 +2444,7 @@ static void gen6_ggtt_insert_entries(struct i915_address_space *vm, enum i915_cache_level level, u32 flags) { struct drm_i915_private *dev_priv = to_i915(vm->dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; + struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm); unsigned first_entry = start >> PAGE_SHIFT; gen6_pte_t __iomem *gtt_entries = (gen6_pte_t __iomem *)ggtt->gsm + first_entry; @@ -2481,7 +2488,7 @@ static void gen8_ggtt_clear_range(struct i915_address_space *vm, bool use_scratch) { struct drm_i915_private *dev_priv = to_i915(vm->dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; + struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm); unsigned first_entry = start >> PAGE_SHIFT; unsigned num_entries = length >> PAGE_SHIFT; gen8_pte_t scratch_pte, __iomem *gtt_base = @@ -2513,7 +2520,7 @@ static void gen6_ggtt_clear_range(struct i915_address_space *vm, bool use_scratch) { struct drm_i915_private *dev_priv = to_i915(vm->dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; + struct i915_ggtt *ggtt = i915_vm_to_ggtt(vm); unsigned first_entry = start >> PAGE_SHIFT; unsigned num_entries = length >> PAGE_SHIFT; gen6_pte_t scratch_pte, __iomem *gtt_base =