From patchwork Thu Jan 12 11:21:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9513041 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 97A7960476 for ; Thu, 12 Jan 2017 11:21:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A7E5286B2 for ; Thu, 12 Jan 2017 11:21:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E146286C4; Thu, 12 Jan 2017 11:21:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0E0CE286B2 for ; Thu, 12 Jan 2017 11:21:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AED516EC24; Thu, 12 Jan 2017 11:21:15 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1DB76EC24 for ; Thu, 12 Jan 2017 11:21:13 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l2so2978666wml.2 for ; Thu, 12 Jan 2017 03:21:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=dsS89GpsttjEMzqnOOP195O23NkX2wDumCNWAPBIy50=; b=MNpLO4rg/LzqSpKAJ2RXngK14kr98FPVi8kfqw6skVdzSCr8vs1khWcNPMtPWUGlcW Hj1CFr6B+kfKBJ1ZKmkGgYuUoZAnTPd9bm0L80EWBDkyGKHMOTIwwu/gweHksmcKh8Lr 8B6biVH0gNbXMdNNKy2UYqqNaH28TONCnSMnx0AGDEXJhjzDnLt58eHWuHEkDFeHyYV4 vYWzngZTTyfED9S/lNARg1gY4JFpf0pUGxjeGicy5sLPEHsK5LTnflw/IOX1caGROkYT /gAxZvw7mFJUIfJreMh6ZQ+reUVDKPs4o0GkOACRqE9OxpDeJSlObb1lQgn4fHEUR3YY 7xWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=dsS89GpsttjEMzqnOOP195O23NkX2wDumCNWAPBIy50=; b=oJjs2/viUT0wf/dXZXbBDSpI+zswQZ5nUokkhUZjRESvMUiaWeQQdO1XmmbPT30rrb xFJU0QDl5HICsaKwxdgNbjOA3d1Dl/0U3BDZ2syyiRKzZ+qoh+SxWBQexPKTucEkcd3G FB3ae00S1DCvxU4dv3dZE1Lb43mUcpQQ1GJ9Ci8JzOIUCnht9DXyb/g6ndu5wF1+1fX5 MmY3QUjknshpaYJvtg5eLeUp+qZ6SFqKBqGDJub5rU9zMZEzolqKb0SWR5bmiCa5Td7A Yw+y7mHa/5FYp9f9j/X0new2cn/EFmnWKJQBiUu0eeUlCjQWvpmvpz9CwYGDuB8sSPPI TBeA== X-Gm-Message-State: AIkVDXKmsnunVMyECeP6yxCvQO17oXTnihg+QrlZZAw0/O5sX4tjBauxDBBnm8sm+75Zqw== X-Received: by 10.28.67.134 with SMTP id q128mr5779101wma.34.1484220072445; Thu, 12 Jan 2017 03:21:12 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id kq7sm13101671wjb.30.2017.01.12.03.21.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2017 03:21:10 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 12 Jan 2017 11:21:08 +0000 Message-Id: <20170112112108.31632-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH v3] drm/i915: Expand ggtt_view paramters for 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-Virus-Scanned: ClamAV using ClamSMTP When dumping the VMA, include the parameters of the different GGTT views so that we can distinguish them. v2: Contract output and add MISSING_CASE for any unknown types. v3: Show both stride and offset for rotated planes. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviwed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_debugfs.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 9d7b5a8c8dea..43499bb36640 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -159,8 +159,34 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) seq_printf(m, " (%sgtt offset: %08llx, size: %08llx", i915_vma_is_ggtt(vma) ? "g" : "pp", vma->node.start, vma->node.size); - if (i915_vma_is_ggtt(vma)) - seq_printf(m, ", type: %u", vma->ggtt_view.type); + if (i915_vma_is_ggtt(vma)) { + switch (vma->ggtt_view.type) { + case I915_GGTT_VIEW_NORMAL: + seq_puts(m, ", normal"); + break; + + case I915_GGTT_VIEW_PARTIAL: + seq_printf(m, ", partial [%08llx+%x]", + vma->ggtt_view.params.partial.offset, + vma->ggtt_view.params.partial.size << PAGE_SHIFT); + break; + + case I915_GGTT_VIEW_ROTATED: + seq_printf(m, ", rotated [(%ux%u, stride=%u, offset=%u), (%ux%u, stride=%u, offset=%u)]", + vma->ggtt_view.params.rotated.plane[0].width, + vma->ggtt_view.params.rotated.plane[0].height, + vma->ggtt_view.params.rotated.plane[0].stride, + vma->ggtt_view.params.rotated.plane[0].offset, + vma->ggtt_view.params.rotated.plane[1].width, + vma->ggtt_view.params.rotated.plane[1].height, + vma->ggtt_view.params.rotated.plane[1].stride, + vma->ggtt_view.params.rotated.plane[1].offset); + break; + default: + MISSING_CASE(vma->ggtt_view.type); + break; + } + } if (vma->fence) seq_printf(m, " , fence: %d%s", vma->fence->id,