From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 3/5] drm/i915: Kill off now unused gen6+ AGP
	code
Date: Fri, 02 Nov 2012 12:28:26 +0000
Message-ID: <b94cdc$76inat@fmsmga001.fm.intel.com>
References: <1351790643-4626-1-git-send-email-ben@bwidawsk.net>
	<1351790643-4626-3-git-send-email-ben@bwidawsk.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id 05DDC9E77C
	for <intel-gfx@lists.freedesktop.org>;
	Fri,  2 Nov 2012 05:29:14 -0700 (PDT)
In-Reply-To: <1351790643-4626-3-git-send-email-ben@bwidawsk.net>
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+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>
List-Id: intel-gfx@lists.freedesktop.org

On Thu,  1 Nov 2012 10:24:01 -0700, Ben Widawsky <ben@bwidawsk.net> wrote:
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
> @@ -1269,22 +1108,8 @@ static int i9xx_setup(void)
>  		pci_read_config_dword(intel_private.pcidev,
>  				      I915_PTEADDR, &gtt_addr);
>  		intel_private.gtt_bus_addr = gtt_addr;
> -	} else {
> -		u32 gtt_offset;
> -
> -		switch (INTEL_GTT_GEN) {
> -		case 5:
> -		case 6:
> -		case 7:
> -			gtt_offset = MB(2);
> -			break;
> -		case 4:
> -		default:
> -			gtt_offset =  KB(512);
> -			break;
> -		}
> -		intel_private.gtt_bus_addr = reg_addr + gtt_offset;
> -	}
> +	} else
> +		intel_private.gtt_bus_addr = reg_addr + KB(512);

We still need to handle GEN==5 here which has a MB(2) GTT.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre