From owner-freebsd-multimedia@FreeBSD.ORG Mon Mar 29 15:32:39 2004 Return-Path: Delivered-To: freebsd-multimedia@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CFC516A4CE for ; Mon, 29 Mar 2004 15:32:39 -0800 (PST) Received: from hak.cnd.mcgill.ca (hak.cnd.mcgill.ca [132.216.11.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F6F843D2D for ; Mon, 29 Mar 2004 15:32:39 -0800 (PST) (envelope-from mat@hak.cnd.mcgill.ca) Received: from hak.cnd.mcgill.ca (localhost [127.0.0.1]) by hak.cnd.mcgill.ca (8.12.9/8.12.8) with ESMTP id i2TNZDK0006277 for ; Mon, 29 Mar 2004 18:35:13 -0500 (EST) (envelope-from mat@hak.cnd.mcgill.ca) Received: (from mat@localhost) by hak.cnd.mcgill.ca (8.12.9/8.12.8/Submit) id i2TNZDCK006276 for freebsd-multimedia@freebsd.org; Mon, 29 Mar 2004 18:35:13 -0500 (EST) Date: Mon, 29 Mar 2004 18:35:13 -0500 From: Mathew Kanner To: freebsd-multimedia@freebsd.org Message-ID: <20040329233513.GA6187@cnd.mcgill.ca> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="NzB8fVQJ5HfG6fxh" Content-Disposition: inline User-Agent: Mutt/1.4.1i Organization: I speak for myself, operating in Montreal, CANADA X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.62 X-Spam-Checker-Version: SpamAssassin 2.62 (2004-01-11) on hak.cnd.mcgill.ca Subject: please review snd_ich patch X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2004 23:32:39 -0000 --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello All, I'm going to commit a patch by Autrijus Tang that fixes snd_ich for him. I've asked for comments from the list and haven't really heard much so I thought I would try a second time. So. I'm going to commit the following patch tommorow, please let me know if it doesn't work for you. --Mat -- The state has no business in the bedrooms of the nation. - Pierre Elliott Trudeau --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="snd_ich5.patch" Index: sys/dev/sound/pci/ich.c =================================================================== RCS file: /home/ncvs/src/sys/dev/sound/pci/ich.c,v retrieving revision 1.39 diff -u -r1.39 ich.c --- sys/dev/sound/pci/ich.c 17 Mar 2004 17:50:44 -0000 1.39 +++ sys/dev/sound/pci/ich.c 28 Mar 2004 14:14:57 -0000 @@ -693,12 +693,23 @@ } /* + * By default, ich4 has NAMBAR and NABMBAR i/o spaces as + * read-only. Need to enable "legacy support", by poking into + * pci config space. The driver should use MMBAR and MBBAR, + * but doing so will mess things up here. ich4 has enough new + * features it warrants it's own driver. + */ + if (pci_get_devid(dev) == ICH4ID) { + pci_write_config(dev, PCIR_ICH_LEGACY, ICH_LEGACY_ENABLE, 1); + } + + /* * Enable bus master. On ich4/5 this may prevent the detection of * the primary codec becoming ready in ich_init(). */ pci_enable_busmaster(dev); - if ((pci_get_devid(dev) == ICH4ID) || (pci_get_devid(dev) == ICH5ID)) { + if (pci_get_devid(dev) == ICH5ID) { sc->nambarid = PCIR_MMBAR; sc->nabmbarid = PCIR_MBBAR; sc->regtype = SYS_RES_MEMORY; --NzB8fVQJ5HfG6fxh--