From patchwork Tue Jan 7 00:55:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 3445071 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 90C5F9F2E9 for ; Tue, 7 Jan 2014 00:58:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE6E22017A for ; Tue, 7 Jan 2014 00:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13D632016D for ; Tue, 7 Jan 2014 00:58:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757619AbaAGA4A (ORCPT ); Mon, 6 Jan 2014 19:56:00 -0500 Received: from mail-ie0-f170.google.com ([209.85.223.170]:43720 "EHLO mail-ie0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756732AbaAGAz5 (ORCPT ); Mon, 6 Jan 2014 19:55:57 -0500 Received: by mail-ie0-f170.google.com with SMTP id qd12so19831217ieb.29 for ; Mon, 06 Jan 2014 16:55:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=ZJIOhFrlWjQM3wLEdG+442Z5vbWs/lopRiFc7rDUh2I=; b=ZFDINnVPYJHDiM1b6gGLOXafbhhOxrSeHoi2YaEctAj7anYSBDTSGgI9O8HiP80sgg +MPwQOjHcMVdECVbyoO1Mv4zLEjVu2Zqta7i2Zibn2EIWf2mnIKguiDANL4p6qolUHr5 h0VU357BuMPLUXKoEVvoIv3w+wasv4swMtdQiDwPdYxyOjFkzPXOGxkdFSm/weatdB9t AKCA4UbsL2NNthiup/Hyt2ONGxdAF1u34dr/cNsJcJnr+AoLXby374h+pu6VTzPrF2Jm aYIG+00MRJcIrAYz70UsMFg+pjh/LcjmRan3/EbKZ5D4XR5zNSFvuTzRYxvpoee6ucEF MRMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=ZJIOhFrlWjQM3wLEdG+442Z5vbWs/lopRiFc7rDUh2I=; b=eYPY1CrXo7pBrH9S2hkDSgWFXl4CfCNnRPppY6SmHfNedgsFLewQ3m77ZZrzbYk2vG yxb1zZL9P/KTAIrYnMpueGezAKv6rlAT5/GX7xHx8o5dXz9/AB9n1JhcYyYST5hmR3pU DANrfDu+UC3vZjUmrD2+AthLQhDHMVu0BqNPTQNOzyl0puEMfj/HtMtf6jEhc0zyzsPI smgVpuFzUdof+a++9bqwterSoeJjKCywPU5o6sTb/5yBiRyVxBix+F4AwnDLhfmHq/ua iUWhGg0e4UJm/W+//yCPxjhcwEDZFYr1KBZvg6cPDrx8LN8RGsOsXweVXBmVgS90ZTxd CmCA== X-Gm-Message-State: ALoCoQkap6vJSMXT1pRAqQ4m6Ur7U8B8xOianFCdc3MXM80vA+qAlPwVQpH55Q4DhmO+SIu5KqaGw3xpyGNQYh0P4fYy5ktincEKCuXkQDTVGJiaG/MrIQSN6nVmHWtjSeESJV7gEPXWfUsEYtII65xfFQsFkxCGdPTKvgqIfDGHmxcfu8bwunD6RBytZpXdwi+1xD5KEl/OTIRxtqlJLh+ov7idiDgAMOvH71NavLEX7rbukIvG99s= X-Received: by 10.50.16.243 with SMTP id j19mr23060882igd.4.1389056157485; Mon, 06 Jan 2014 16:55:57 -0800 (PST) Received: from localhost ([172.29.127.26]) by mx.google.com with ESMTPSA id d18sm923742igz.0.2014.01.06.16.55.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 06 Jan 2014 16:55:56 -0800 (PST) Subject: [PATCH v7 06/15] drm/i915: Rename gtt_bus_addr to gtt_phys_addr To: linux-pci@vger.kernel.org, Daniel Vetter From: Bjorn Helgaas Cc: David Airlie , Yinghai Lu , Guo Chao , linux-kernel@vger.kernel.org Date: Mon, 06 Jan 2014 17:55:55 -0700 Message-ID: <20140107005555.10786.46881.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140107005003.10786.85164.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140107005003.10786.85164.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, 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 We're dealing with CPU physical addresses here, which may be different from bus addresses, so rename gtt_bus_addr to gtt_phys_addr to avoid confusion. No functional change. Signed-off-by: Bjorn Helgaas --- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 3620a1b0a73c..15604b3dda3e 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1260,14 +1260,14 @@ static int ggtt_probe_common(struct drm_device *dev, size_t gtt_size) { struct drm_i915_private *dev_priv = dev->dev_private; - phys_addr_t gtt_bus_addr; + phys_addr_t gtt_phys_addr; int ret; /* For Modern GENs the PTEs and register space are split in the BAR */ - gtt_bus_addr = pci_resource_start(dev->pdev, 0) + + gtt_phys_addr = pci_resource_start(dev->pdev, 0) + (pci_resource_len(dev->pdev, 0) / 2); - dev_priv->gtt.gsm = ioremap_wc(gtt_bus_addr, gtt_size); + dev_priv->gtt.gsm = ioremap_wc(gtt_phys_addr, gtt_size); if (!dev_priv->gtt.gsm) { DRM_ERROR("Failed to map the gtt page table\n"); return -ENOMEM;