From patchwork Tue Oct 20 16:29:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 54973 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9KGUYbS017046 for ; Tue, 20 Oct 2009 16:30:34 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F0859EDBE; Tue, 20 Oct 2009 09:30:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from orsmga101.jf.intel.com (mga06.intel.com [134.134.136.21]) by gabe.freedesktop.org (Postfix) with ESMTP id E96E79E817 for ; Tue, 20 Oct 2009 09:30:31 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 20 Oct 2009 09:14:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,592,1249282800"; d="scan'208";a="459517568" Received: from unknown (HELO localhost.localdomain) ([10.255.16.11]) by orsmga002.jf.intel.com with ESMTP; 20 Oct 2009 09:36:06 -0700 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 20 Oct 2009 17:29:16 +0100 Message-Id: <1256056156-16459-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 1.6.5 In-Reply-To: <4ADDE11E.6030502@gmail.com> References: <4ADDE11E.6030502@gmail.com> Cc: Miles Lane , dri-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [Intel-gfx] [PATCH] drm/i915: Avoid potential sleep whilst holding spinlock X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 2ace8b7..9087c4c 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -268,10 +268,10 @@ static void i915_dump_pages(struct seq_file *m, struct page **pages, int page_co uint32_t *mem; for (page = 0; page < page_count; page++) { - mem = kmap(pages[page]); + mem = kmap_atomic(pages[page], KM_USER0); for (i = 0; i < PAGE_SIZE; i += 4) seq_printf(m, "%08x : %08x\n", i, mem[i / 4]); - kunmap(pages[page]); + kunmap_atomic(pages[page], KM_USER0); } }