From mboxrd@z Thu Jan  1 00:00:00 1970
From: Imre Deak <imre.deak@intel.com>
Subject: Re: [PATCH 19/62] drm/i915/bdw: Create gen8_gtt_pte_t
Date: Tue, 05 Nov 2013 00:03:12 +0200
Message-ID: <1383602592.4073.8.camel@ideak-mobl>
References: <1383451680-11173-1-git-send-email-benjamin.widawsky@intel.com>
	<1383451680-11173-20-git-send-email-benjamin.widawsky@intel.com>
Reply-To: imre.deak@intel.com
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga14.intel.com (mga14.intel.com [143.182.124.37])
	by gabe.freedesktop.org (Postfix) with ESMTP id A44A2101E7C
	for <intel-gfx@lists.freedesktop.org>;
	Mon,  4 Nov 2013 14:03:16 -0800 (PST)
In-Reply-To: <1383451680-11173-20-git-send-email-benjamin.widawsky@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Intel GFX <intel-gfx@lists.freedesktop.org>, Ben Widawsky <ben@bwidawsk.net>
List-Id: intel-gfx@lists.freedesktop.org

On Sat, 2013-11-02 at 21:07 -0700, Ben Widawsky wrote:
> With gen6 PTE type in place, pave the way for the new gen8 type.
> 
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index c6d38d0..8bf2184 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -30,6 +30,7 @@
>  
>  #define GEN6_PPGTT_PD_ENTRIES 512
>  #define I915_PPGTT_PT_ENTRIES (PAGE_SIZE / sizeof(gen6_gtt_pte_t))
> +typedef uint64_t gen8_gtt_pte_t;
>  
>  /* PPGTT stuff */
>  #define GEN6_GTT_ADDR_ENCODE(addr)	((addr) | (((addr) >> 28) & 0xff0))
> @@ -942,7 +943,7 @@ static int gen8_gmch_probe(struct drm_device *dev,
>  	*stolen = gen8_get_stolen_size(snb_gmch_ctl);
>  
>  	gtt_size = gen8_get_total_gtt_size(snb_gmch_ctl);
> -	*gtt_total = (gtt_size / 8) << PAGE_SHIFT;
> +	*gtt_total = (gtt_size / sizeof(gen8_gtt_pte_t)) << PAGE_SHIFT;
>  
>  	ret = ggtt_probe_common(dev, gtt_size);
>