From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Slusarz Subject: Re: [RESEND PATCH] drm/nouveau: fix init with agpgart-uninorth Date: Tue, 1 Jan 2013 02:21:45 +0100 Message-ID: <20130101011158.GA7601@joi.lan> References: <1356917699-19479-1-git-send-email-aaro.koskinen@iki.fi> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1356917699-19479-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-kernel-owner@vger.kernel.org To: Aaro Koskinen , Ben Skeggs Cc: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stefan@konink.de List-Id: dri-devel@lists.freedesktop.org On Mon, Dec 31, 2012 at 03:34:59AM +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.). >=20 > The patch fixes the following error seen on G5 iMac: >=20 > nouveau E[ DRM] failed to create kernel channel, -12 >=20 > Reviewed-by: Michel D=C3=A4nzer > Signed-off-by: Aaro Koskinen > --- This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=3D58806. =46or some (weird) reason Nouveau worked on this configuration on 3.6 k= ernel, so cc'ing stable@vger seems to be appropriate. > drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/n= ouveau/nouveau_bo.c > index 5614c89..69d7b1d 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -1276,7 +1276,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; > } > #endif > break; > --=20