From patchwork Mon Apr 18 11:14:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8870961 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2CAB69F1C1 for ; Mon, 18 Apr 2016 11:14:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B82E20211 for ; Mon, 18 Apr 2016 11:14:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 414E720270 for ; Mon, 18 Apr 2016 11:14:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E6C36E591; Mon, 18 Apr 2016 11:14:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 56ECE6E591 for ; Mon, 18 Apr 2016 11:14:20 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id l6so23661510wml.3 for ; Mon, 18 Apr 2016 04:14:20 -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=nxrwqGjn7EsGjG6Vo1wHbftT+S+MvuyuRgLtX9kCib8=; b=UygAFfjlf6a+3+aTsz76YAQmFBDebDsJercXu/+T0q2atOj65ER12NtPnUWFThCgqC PXJO6NrqlNqQOVIpvHfNgHKKvEZm305bvg9ORJny6Vdpw06kNSOuXgqLiir/7dRAoKBI 3mCoQctqYtD6Dn9dBgY6Es82Ubr1MQRloFG3SsRM6PXoIhYNlWlMRqV3D6PtplScPfZ3 X4kzwX9Azpu51M8ExrM7yhXLd0QyuCXqgqf1Kbtc+usHVRONrCyKe0ZgrM0wo/LZhOZb VDrYnNmRwYQznAAexFq/s6xizpYI2GNcw1Urr8TlXlbdPcSC9U7fgMdHnOKK64OAA7CI XA6A== 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=nxrwqGjn7EsGjG6Vo1wHbftT+S+MvuyuRgLtX9kCib8=; b=IE5RKrjQ9gW1fG7yLxxweTihmnXLkuBgrwNk/RFPilmkWxum6ddYagEkaoXdmzqImO zerOpbat/lvOZafV2a78kpiGqtAvt9/n5J0p3uNPJE8A6HeijUKwN9sGgyW/BhpHBqJz 9AyR1/W/vI7Ay1i9akJxOyekuEsSvG0Sc6cjiJgfMtevG4q6wJeLvUzvrbAnCqJDzsuD 1+e3oiWa8QEQYMDYa7FL4wLu7AfiCne7mG8Kd9dL7ETJczIyj+F7mjaNdOm6qw8Ml8Ay LVvqVD84TqacC9kytEMhDgK/qiDm66eNzkV6Sj2Nsf/jtRINdaWlBPtoh1w9OuEL2nEC X6yQ== X-Gm-Message-State: AOPr4FX/aHLsHtSer0HdO4wF/zbgITV9hdgioxye+bK0aF4WzgaPbknZlH1ExOn/tNEjiQ== X-Received: by 10.194.115.196 with SMTP id jq4mr34581676wjb.101.1460978058752; Mon, 18 Apr 2016 04:14:18 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id jp2sm5511952wjc.16.2016.04.18.04.14.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 04:14:17 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 18 Apr 2016 12:14:01 +0100 Message-Id: <1460978042-9953-3-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1460978042-9953-1-git-send-email-chris@chris-wilson.co.uk> References: <1460978042-9953-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 3/4] 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: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- 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 9f165feb54ae..b3af2e808b49 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 =