From patchwork Sun Apr 24 07:31:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8919881 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 BAB50BF29F for ; Sun, 24 Apr 2016 07:32:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF203201F2 for ; Sun, 24 Apr 2016 07:31:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 03E5A201ED for ; Sun, 24 Apr 2016 07:31:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09CA16E119; Sun, 24 Apr 2016 07:31:56 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7960B6E052 for ; Sun, 24 Apr 2016 07:31:54 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r12so14277987wme.0 for ; Sun, 24 Apr 2016 00:31:54 -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=Hwtn6vqngONtdjBMPvzhn5SigYg+6dWEiyOWwRGtRzo=; b=lAM3Cdz8n2w043BxGmj057aE4d5McH5/ki7srD2cLZRCc2AQQMQZKh+pwgRF0jT0wr AXsTRaSKLYe5S1hxZCju+IaFZDG6iHFjYhPhVi21y4IDJoqBNCBqvJJB3qA3CMbjujRU Gy50RLO7HZx+1hekMJGxcphmrPl75bOVYOjnTrQIFMsjE3ndoVmEMdah736PDzrpCHwZ G0u493BFKqmAjd+UE5Pa+dqiRxJ4SM3jme+L3aj+2L72aATkSA7H1iNXBoLfYuuyWub8 khGlCiWvizwD84bP/ytenp8npCZJePOxPBFFBBx/V3h/pzkW44jW08IJoRtqJVqpfJOX bllg== 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=Hwtn6vqngONtdjBMPvzhn5SigYg+6dWEiyOWwRGtRzo=; b=Tpqu3hD8T24e8Jx4TAHUTa/9D7JqXcF6ojAGMY2z3JU8EACQPLlcaF9qqbjZU9F3Rd EpZQiW4xyk2EUmiPoDInlHvGHPuesF2ev1NLxSvBH1091ZPFKSgzEIv4z3qfyOjO1gTK CguNizat/WvsXpjVjv5t/VLSVKkfFA3I8WofxoArt/A47rPm2Eny1IcG34FSQl5ecSI2 pJS03rmTdWgyteBpnqAy3cECTnd4ghoFjENASnri4jAka9Hqdw/E9ECn2amfq4jsbvJW WwXzvyVi2qVlWmvb8SAK4iOb87ChYeyPMkUZqK6PWEls/Fic3UCpLqUQ972RVdmiZn7m oB3A== X-Gm-Message-State: AOPr4FUNZdVQ5nQgdI+PsYzCk7DzLWS6nfJCGHktHeEVAkP0xAR7jRm31nkyBRUfny/ngQ== X-Received: by 10.28.97.9 with SMTP id v9mr5352168wmb.45.1461483112997; Sun, 24 Apr 2016 00:31:52 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id c4sm16964833wjm.24.2016.04.24.00.31.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 00:31:51 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 24 Apr 2016 08:31:22 +0100 Message-Id: <1461483101-10618-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461483101-10618-1-git-send-email-chris@chris-wilson.co.uk> References: <1461483101-10618-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 02/21] drm/i915/overlay: Replace i915_gem_obj_ggtt_offset() with the known flip_addr 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 When setting up the overlay page, we pin it into the GGTT (when using virtual addresses) and store the offset as overlay->flip_addr. Rather than doing a lookup of the GGTT address everytime, we can use the known address instead. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_overlay.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index bcc3b6a016d8..9746b9841c13 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -198,7 +198,7 @@ intel_overlay_map_regs(struct intel_overlay *overlay) regs = (struct overlay_registers __iomem *)overlay->reg_bo->phys_handle->vaddr; else regs = io_mapping_map_wc(ggtt->mappable, - i915_gem_obj_ggtt_offset(overlay->reg_bo)); + overlay->flip_addr); return regs; } @@ -1493,7 +1493,7 @@ intel_overlay_map_regs_atomic(struct intel_overlay *overlay) overlay->reg_bo->phys_handle->vaddr; else regs = io_mapping_map_atomic_wc(ggtt->mappable, - i915_gem_obj_ggtt_offset(overlay->reg_bo)); + overlay->flip_addr); return regs; } @@ -1523,10 +1523,7 @@ intel_overlay_capture_error_state(struct drm_device *dev) error->dovsta = I915_READ(DOVSTA); error->isr = I915_READ(ISR); - if (OVERLAY_NEEDS_PHYSICAL(overlay->dev)) - error->base = (__force long)overlay->reg_bo->phys_handle->vaddr; - else - error->base = i915_gem_obj_ggtt_offset(overlay->reg_bo); + error->base = overlay->flip_addr; regs = intel_overlay_map_regs_atomic(overlay); if (!regs)