From patchwork Tue Dec 18 18:31:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 1893471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 4FBD0DF2F6 for ; Tue, 18 Dec 2012 18:48:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E320E5DC3 for ; Tue, 18 Dec 2012 10:48:24 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from azsmga101.ch.intel.com (mga07.intel.com [143.182.124.22]) by gabe.freedesktop.org (Postfix) with ESMTP id C20CAE63AC for ; Tue, 18 Dec 2012 10:35:24 -0800 (PST) Received: from mail-pb0-f69.google.com ([209.85.160.69]) by mga03.intel.com with ESMTP/TLS/RC4-SHA; 18 Dec 2012 10:35:24 -0800 Received: by mail-pb0-f69.google.com with SMTP id un15so917853pbc.4 for ; Tue, 18 Dec 2012 10:35:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=Jgnt58sQE04dclJG82EMKdwTIl6fipm9zkn4X2d8JWs=; b=cTRpCNmTKaw7c9RUMweR9QqIMdk2S1aFvTmESI2QZEI6RFvwuS9NHiCqaodFBXPR2H bDqL9nd5Xi9RnA6D7IqO3kfEeBJ/PrkVuWR4E8Cl65H/0pycI6ZFwnVWvzSYZbj8oxEg E6t/MEJq628nBU199ysNxi7tH2wzt1P3A4JZtv2hLsV6muvNbZeNU9m9JG5QIic9d/fv 4Q8rYlQvbcFILJ8kFETlBfAPCSMAUNfjHC+bnljMy8aNgROmNh67glMqhT3wLAYv/MZA A6TP2EMG2ozKm8WpZeil9yEv0Sp4o6cfwEW2sgonViDyzqgbr9+yt7q4Y5i9/77R+Xwk oKCQ== X-Received: by 10.68.213.33 with SMTP id np1mr9454644pbc.64.1355855718445; Tue, 18 Dec 2012 10:35:18 -0800 (PST) X-Received: by 10.68.213.33 with SMTP id np1mr9454532pbc.64.1355855717615; Tue, 18 Dec 2012 10:35:17 -0800 (PST) Received: from norris.jf.intel.com ([192.55.55.41]) by mx.google.com with ESMTPS id ip8sm1552525pbc.36.2012.12.18.10.35.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 10:35:17 -0800 (PST) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Tue, 18 Dec 2012 10:31:24 -0800 Message-Id: <1355855487-20424-3-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> References: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> X-Gm-Message-State: ALoCoQnSMCWdw8+5c4vG/hyN8HnluIT5dYsEdROKSV38kX4C1/UsLa2VTiFlB4zW6vzv2oWBHyXJTs6V6OWuEG6eDZ8/20onW/FmAQgLLGbaQtNPQEUPLIky+ZJqrmY5a0fshBDu0XSnLJC05Kyghx8qbG+SYq4SjIZH9hfigQAQsLVBDKH0n7U= X-Mailman-Approved-At: Tue, 18 Dec 2012 10:45:21 -0800 Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 3/6] drm/i915: Missed conversion to gtt_pte_t X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org commit f61c0609073133375ace61f74b0e4e7cf631406b Author: Ben Widawsky Date: Mon Oct 22 11:44:43 2012 -0700 drm/i915: introduce gtt_pte_t Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 9ae588a..b699a04 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -282,7 +282,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev) uint32_t pd_offset; struct intel_ring_buffer *ring; struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt; - uint32_t __iomem *pd_addr; + gtt_pte_t __iomem *pd_addr; uint32_t pd_entry; int i; @@ -290,7 +290,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev) return; - pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof(uint32_t); + pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof(gtt_pte_t); for (i = 0; i < ppgtt->num_pd_entries; i++) { dma_addr_t pt_addr;