From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 23/23] drm/i915: die, i915_probe_agp, die
Date: Sun, 05 Sep 2010 17:10:58 +0100
Message-ID: <89kc63$i00a4v@fmsmga002.fm.intel.com>
References: <1283373010-1314-1-git-send-email-daniel.vetter@ffwll.ch>
	<1283373010-1314-24-git-send-email-daniel.vetter@ffwll.ch>
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 mga01.intel.com (mga01.intel.com [192.55.52.88])
	by gabe.freedesktop.org (Postfix) with ESMTP id 6ABD39E7B3
	for <intel-gfx@lists.freedesktop.org>;
	Sun,  5 Sep 2010 09:11:01 -0700 (PDT)
In-Reply-To: <1283373010-1314-24-git-send-email-daniel.vetter@ffwll.ch>
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: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

On Wed,  1 Sep 2010 22:30:10 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Use the detection from intel-gtt.ko instead. Hooray!
> 
> Also move the stolen mem allocator to the other gtt stuff in dev_priv->mem.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> @@ -2106,15 +1940,12 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>  			 "performance may suffer.\n");
>  	}
>  
> -	ret = i915_probe_agp(dev, &agp_size, &prealloc_size, &prealloc_start);
> -	if (ret)
> +	dev_priv->mm.gtt = intel_gtt_get();
> +	if (!dev_priv->mm.gtt)
DRM_ERROR("Failed to initialize GTT\n");
ret = -ENODEV;
>  		goto out_iomapfree;

-- 
Chris Wilson, Intel Open Source Technology Centre