From owner-freebsd-stable@FreeBSD.ORG Wed Feb 26 20:34:38 2014 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6B93E4B; Wed, 26 Feb 2014 20:34:38 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B9E2718F6; Wed, 26 Feb 2014 20:34:38 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id C44B6B977; Wed, 26 Feb 2014 15:34:37 -0500 (EST) From: John Baldwin To: Sergey Matveychuk Subject: Re: Fwd: panic after upgrade to 10 Date: Wed, 26 Feb 2014 15:34:29 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; ) References: <5308B98C.6070807@semmy.ru> <530E3D85.8060906@FreeBSD.org> <201402261441.02262.jhb@freebsd.org> In-Reply-To: <201402261441.02262.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201402261534.29297.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 26 Feb 2014 15:34:37 -0500 (EST) Cc: freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 20:34:39 -0000 On Wednesday, February 26, 2014 2:41:02 pm John Baldwin wrote: > On Wednesday, February 26, 2014 2:16:21 pm Sergey Matveychuk wrote: > > Yes, no panic now. > > For some reason agp0 is Intel 82855GM host to AGP bridge and agp1 is VGA > > controller itself. > > Yes, on this machine we should probably only be using agp1 and not agp0. > I'm guessing 8.x simply did not have 'device agp' in GENERIC which is why > you didn't see this. Right now my patch is preventing the panic, but > /dev/agpgart probably isn't working quite right. I guess you aren't > running X on this though? Actually, please try this patch instead. It changes the agp devices to create /dev/agpN and the first device should create a /dev/agpgart symlink. I think this means you can then move the symlink if needed, so that in your case if you wanted to use X you could move it to /dev/agp1 instead of /dev/agp0. Index: sys/dev/agp/agp.c =================================================================== --- agp.c (revision 262488) +++ agp.c (working copy) @@ -212,6 +212,7 @@ int agp_generic_attach(device_t dev) { struct agp_softc *sc = device_get_softc(dev); + struct cdev *cdev; int i; u_int memsize; @@ -232,7 +233,7 @@ agp_generic_attach(device_t dev) /* * Work out an upper bound for agp memory allocation. This - * uses a heurisitc table from the Linux driver. + * uses a heuristic table from the Linux driver. */ memsize = ptoa(realmem) >> 20; for (i = 0; i < agp_max_size; i++) { @@ -257,8 +258,9 @@ agp_generic_attach(device_t dev) sc->as_nextid = 1; sc->as_devnode = make_dev(&agp_cdevsw, - 0, UID_ROOT, GID_WHEEL, 0600, "agpgart"); + 0, UID_ROOT, GID_WHEEL, 0600, "%s", device_get_nameunit(dev)); sc->as_devnode->si_drv1 = dev; + make_dev_alias_p(MAKEDEV_CHECKNAME, &cdev, sc->as_devnode, "agpgart"); return 0; } -- John Baldwin