From owner-cvs-all@FreeBSD.ORG Tue Sep 9 02:05:21 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38585106564A; Tue, 9 Sep 2008 02:05:21 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2569F8FC13; Tue, 9 Sep 2008 02:05:21 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8925LxJ007390; Tue, 9 Sep 2008 02:05:21 GMT (envelope-from rnoland@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8925KKW007378; Tue, 9 Sep 2008 02:05:20 GMT (envelope-from rnoland@repoman.freebsd.org) Message-Id: <200809090205.m8925KKW007378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rnoland@repoman.freebsd.org using -f From: Robert Noland Date: Tue, 9 Sep 2008 02:05:03 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/drm ati_pcigart.c drm_bufs.c drm_pci.c i915_dma.c mach64_dma.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2008 02:05:21 -0000 rnoland 2008-09-09 02:05:03 UTC FreeBSD src repository Modified files: sys/dev/drm ati_pcigart.c drm_bufs.c drm_pci.c i915_dma.c mach64_dma.c Log: SVN rev 182883 on 2008-09-09 02:05:03Z by rnoland We should never call drm_pci_alloc() while holding locks, due the the calls to bus_dma. There were multiple paths that held different locks or no locks at all. This patch ensures that all of the calling paths drop their lock(s) before calling drm_pci_alloc(). Reviewed by: kib Revision Changes Path 1.5 +9 -4 src/sys/dev/drm/ati_pcigart.c 1.5 +2 -0 src/sys/dev/drm/drm_bufs.c 1.4 +7 -4 src/sys/dev/drm/drm_pci.c 1.9 +12 -6 src/sys/dev/drm/i915_dma.c 1.4 +6 -0 src/sys/dev/drm/mach64_dma.c