From owner-cvs-src@FreeBSD.ORG Thu Jul 12 09:02:32 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5AB5516A41F; Thu, 12 Jul 2007 09:02:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3573813C4C6; Thu, 12 Jul 2007 09:02:32 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6C92Wew099827; Thu, 12 Jul 2007 09:02:32 GMT (envelope-from kib@repoman.freebsd.org) Received: (from kib@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6C92WPi099826; Thu, 12 Jul 2007 09:02:32 GMT (envelope-from kib) Message-Id: <200707120902.l6C92WPi099826@repoman.freebsd.org> From: Konstantin Belousov Date: Thu, 12 Jul 2007 09:02:31 +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 i915_dma.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 09:02:32 -0000 kib 2007-07-12 09:02:31 UTC FreeBSD src repository Modified files: sys/dev/drm i915_dma.c Log: bus_dma_tag_create() and bus_dma_mem_alloc() shall not be called with a non-sleepable lock held. drm_pci_alloc() calls them, thus drm mutex shall not be held during the call. Move the drm_pci_alloc() to the start of the i915_initialize() and drop the the drm mutex around it. Reported by: Ganbold Reviewed by: anholt Approved by: re (hrs) MFC after: 1 week Revision Changes Path 1.5 +15 -9 src/sys/dev/drm/i915_dma.c