From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel =?ISO-8859-1?Q?D=E4nzer?= Subject: Re: [PATCH] drm/nouveau: fix init with agpgart-uninorth Date: Mon, 19 Nov 2012 11:57:18 +0100 Message-ID: <1353322638.27512.82.camel@thor.local> References: <1353059674-17349-1-git-send-email-aaro.koskinen@iki.fi> <1353075369.19903.76.camel@thor.local> <20121116181120.GB8288@blackmetal.musicnaut.iki.fi> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail.gna.ch (darkcity.gna.ch [195.226.6.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 86D74E6082 for ; Mon, 19 Nov 2012 02:57:35 -0800 (PST) In-Reply-To: <20121116181120.GB8288@blackmetal.musicnaut.iki.fi> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Aaro Koskinen Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fre, 2012-11-16 at 20:11 +0200, Aaro Koskinen wrote: = > On Fri, Nov 16, 2012 at 03:16:09PM +0100, Michel D=E4nzer wrote: > > On Fre, 2012-11-16 at 11:54 +0200, Aaro Koskinen wrote: = > > > Check that the AGP aperture can be mapped. This follows a similar cha= nge > > > done for Radeon (commit 365048ff, drm/radeon: AGP memory is only I/O = if > > > the aperture can be mapped by the CPU.). > > > = > > > The patch fixes the following error seen on G5 iMac: > > > = > > > nouveau E[ DRM] failed to create kernel channel, -12 > > > = > > > Signed-off-by: Aaro Koskinen > > > --- > > > drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > = > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/n= ouveau/nouveau_bo.c > > > index 35ac57f..5f0e7ef 100644 > > > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > > > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > > > @@ -1279,7 +1279,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device= *bdev, struct ttm_mem_reg *mem) > > > if (drm->agp.stat =3D=3D ENABLED) { > > > mem->bus.offset =3D mem->start << PAGE_SHIFT; > > > mem->bus.base =3D drm->agp.base; > > > - mem->bus.is_iomem =3D true; > > > + mem->bus.is_iomem =3D !dev->agp->cant_use_aperture; > > = > > Looks good, though radeon also doesn't set TTM_MEMTYPE_FLAG_MAPPABLE for > > the TT memory type if the aperture can't be mapped directly. Maybe > > nouveau should do the same, or maybe it doesn't really matter. Not sure. > = > This would fail with -EINVAL if the MAPPABLE flag is not set. So I think > it's needed? > = > Looking at radeon_ttm.c, the MAPPABLE flag seems to be set in both cases: Ah, indeed, I misread that. Your patch is Reviewed-by: Michel D=E4nzer -- = Earthling Michel D=E4nzer | http://www.amd.com Libre software enthusiast | Debian, X and DRI developer