From patchwork Thu Apr 28 08:56:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8966781 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 72709BF29F for ; Thu, 28 Apr 2016 08:57:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F2D2202AE for ; Thu, 28 Apr 2016 08:57:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 345FC2027D for ; Thu, 28 Apr 2016 08:57:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 279ED6EC88; Thu, 28 Apr 2016 08:57:16 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE4B76EC89 for ; Thu, 28 Apr 2016 08:57:12 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id r12so21004367wme.0 for ; Thu, 28 Apr 2016 01:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=GP0Sc1BjnpVPj5JW5zQ9Xmf8pPCUqvCQcwlS2RRc8YA=; b=BRr/eVCp0Vk5h21Q2yx9r/92WOOUFbvXuLltEGooImNXtsvEzEbRmEgqhLUiJjUnaE GGbtlAg1cUp0b/d6p4t9A/E8mp0Zn0sBP90vCTPULLK9f98hbPLdHJgITXmps7xkvQU9 oYx66G1F4oLKr6Zu5BgunYePKuxh3u9vPTrd4DlhH6KclPJXcS/uDj7YUDH8+Fzaa0iu Wop/x0Szt63ZCHUxYJH5aq8toMVLxzLRO+gdcdpKpV7QIGbXAq2YQPlH8uPJA1MC0RY9 f0X5NFryBs1CoJIgpMsfVbDeLWGeUEehirlVDKcRqzCEJrZjFsdzQBC4icKnkx8BQI6s rdsQ== 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:subject:date:message-id :in-reply-to:references; bh=GP0Sc1BjnpVPj5JW5zQ9Xmf8pPCUqvCQcwlS2RRc8YA=; b=XhDdSNc6FIMvDy9laRcWHWE7zx3XbG9oTaLKhm7Sdz8lVk/uwxjLDQl5h11pyAbbiD Z7vycLFhXSd3bTLCiuMAxPNGyGDqisd0SMbg8exwrERF5OK8RnUCfDGHJWCeVE847dzt UfnF646xyUV/abO9ruROxRse2hH7dofvkXcKtpth/nIBLH0mCHd6KvNb/n420eDh77K5 2bsliVNVFl6McMkiaSH/gEfbWfegUOkzJBf69OTvjNw3KnUYb6pd0b2Cex7q/Vi+tYo0 ONAxWvwkXE6W6F6mS9pMuBUx+LaVLj5WOTzRvzY+nAB1wHms2NpyiNIo4LuBAblZkhkY ztZQ== X-Gm-Message-State: AOPr4FWGVknaishgjHnueXQymH0pQMoT7n55KRjGGhSx+Pg4yU9HCf2pMlwu0/7SU5bhrA== X-Received: by 10.28.12.149 with SMTP id 143mr14104425wmm.51.1461833830146; Thu, 28 Apr 2016 01:57:10 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id f11sm28454544wmf.22.2016.04.28.01.57.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 01:57:09 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Apr 2016 09:56:40 +0100 Message-Id: <1461833819-3991-6-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> References: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 06/25] drm/i915: Use i915_vma_pin_iomap on the ringbuffer object 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 Similarly to i915_gem_object_pin_map on LLC platforms, we can use the new VMA based io mapping on !LLC to amoritize the cost of ringbuffer pinning and unpinning. Signed-off-by: Tvrtko Ursulin Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index d6756ce6a586..d4dab78edc61 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2094,20 +2094,23 @@ static int init_phys_status_page(struct intel_engine_cs *engine) void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf) { + GEM_BUG_ON(ringbuf->vma == NULL); + GEM_BUG_ON(ringbuf->virtual_start == NULL); + if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen) i915_gem_object_unpin_map(ringbuf->obj); else - iounmap(ringbuf->virtual_start); + i915_vma_unpin_iomap(ringbuf->vma); ringbuf->virtual_start = NULL; - ringbuf->vma = NULL; + i915_gem_object_ggtt_unpin(ringbuf->obj); + ringbuf->vma = NULL; } int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev, struct intel_ringbuffer *ringbuf) { struct drm_i915_private *dev_priv = to_i915(dev); - struct i915_ggtt *ggtt = &dev_priv->ggtt; struct drm_i915_gem_object *obj = ringbuf->obj; /* Ring wraparound at offset 0 sometimes hangs. No idea why. */ unsigned flags = PIN_OFFSET_BIAS | 4096; @@ -2141,10 +2144,9 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev, /* Access through the GTT requires the device to be awake. */ assert_rpm_wakelock_held(dev_priv); - addr = ioremap_wc(ggtt->mappable_base + - i915_gem_obj_ggtt_offset(obj), ringbuf->size); - if (addr == NULL) { - ret = -ENOMEM; + addr = i915_vma_pin_iomap(i915_gem_obj_to_ggtt(obj)); + if (IS_ERR(addr)) { + ret = PTR_ERR(addr); goto err_unpin; } }