From patchwork Thu Nov 20 11:12:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Daniel X-Patchwork-Id: 5347521 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C97549F387 for ; Thu, 20 Nov 2014 11:12:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09C96201BC for ; Thu, 20 Nov 2014 11:12:12 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C1BED20172 for ; Thu, 20 Nov 2014 11:12:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F19E96EC84; Thu, 20 Nov 2014 03:12:08 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 613DA6EC84 for ; Thu, 20 Nov 2014 03:12:08 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 20 Nov 2014 03:09:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,423,1413270000"; d="scan'208";a="611044022" Received: from thomasda-linux2.isw.intel.com ([10.102.226.158]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2014 03:12:06 -0800 From: Thomas Daniel To: intel-gfx@lists.freedesktop.org Date: Thu, 20 Nov 2014 11:12:05 +0000 Message-Id: <1416481925-15138-1-git-send-email-thomas.daniel@intel.com> X-Mailer: git-send-email 1.7.9.5 Cc: akash-goels@gmail.com Subject: [Intel-gfx] [PATCH] drm/i915: Don't pin LRC in GGTT when dumping in debugfs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP LRC object does not need to be mapped into the GGTT when dumping. Just use pin_pages. A side-effect of this patch is that a compiler warning goes away (not checking return value of i915_gem_obj_ggtt_pin). Signed-off-by: Thomas Daniel --- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index f91e7f7..7e1e7f7 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1801,25 +1801,30 @@ static int i915_dump_lrc(struct seq_file *m, void *unused) struct page *page; uint32_t *reg_state; int j; + unsigned long ggtt_offset = 0; - i915_gem_obj_ggtt_pin(ctx_obj, - GEN8_LR_CONTEXT_ALIGN, 0); - - page = i915_gem_object_get_page(ctx_obj, 1); - reg_state = kmap_atomic(page); + i915_gem_object_pin_pages(ctx_obj); seq_printf(m, "CONTEXT: %s %u\n", ring->name, intel_execlists_ctx_id(ctx_obj)); + if (!i915_gem_obj_ggtt_bound(ctx_obj)) + seq_puts(m, "\tNot bound in GGTT\n"); + else + ggtt_offset = i915_gem_obj_ggtt_offset(ctx_obj); + + page = i915_gem_object_get_page(ctx_obj, 1); + reg_state = kmap_atomic(page); + for (j = 0; j < 0x600 / sizeof(u32) / 4; j += 4) { seq_printf(m, "\t[0x%08lx] 0x%08x 0x%08x 0x%08x 0x%08x\n", - i915_gem_obj_ggtt_offset(ctx_obj) + 4096 + (j * 4), + ggtt_offset + 4096 + (j * 4), reg_state[j], reg_state[j + 1], reg_state[j + 2], reg_state[j + 3]); } kunmap_atomic(reg_state); - i915_gem_object_ggtt_unpin(ctx_obj); + i915_gem_object_unpin_pages(ctx_obj); seq_putc(m, '\n'); }