From patchwork Wed Oct 12 11:48:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9372409 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 8A8E660772 for ; Wed, 12 Oct 2016 11:48:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B7082949C for ; Wed, 12 Oct 2016 11:48:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FE4B2950C; Wed, 12 Oct 2016 11:48:37 +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 306322949C for ; Wed, 12 Oct 2016 11:48:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D80956E398; Wed, 12 Oct 2016 11:48:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A31B6E398 for ; Wed, 12 Oct 2016 11:48:33 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id b75so6610533lfg.3 for ; Wed, 12 Oct 2016 04:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Oc62Gqqa+7whqRDNo0m9EmrgZ5x7/XcWfgsz91qOuxE=; b=y/VtcWHEc6alBaWPKQS9T1Cl2HZwMM+eX0vqfZbL1pQHXeyDv/Df7zKdA8gNKWlO29 U1IXp3/nICJWt8vbhfgwKP9dQHUb6rs0tPaDAwSHyKuCSdobbms1El/97ZHrvRPbOcmG YQFkc5pTIHe54pL2mqtWGnrvlkcQTqw4/eOSdxKhQkIf4hmLcQ7VF2DoY9z86vBbsuYa 30TZinhT0gcoY09kADKBTPHDIrHXxoG78pbgZez3CvEBUy2AZgQZs5AzV9vbdFrrLQXS CHQs5UfLQuoR1m76hkUSIHDsd8/pHXYugjZfywhvFVqJvQbKMv/w2YOockKsIMOkro+D aUUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Oc62Gqqa+7whqRDNo0m9EmrgZ5x7/XcWfgsz91qOuxE=; b=foWi2I/VVkIFStjfx5/3G9VLFzLnLLnOY/iRIyRTIkY/1HRcm1nMEQkazg0IwGs61t 0+apXjlOs8pPzAH4B0hMVL82auTOskFFUebpXcgSWvlgcD5W64Qi0hDjdS25wEvNhFwt 06T5Hw8hybbmmhzf2zzQFSvJy6PlWNTBDlf//yFv6DMIeD1RsMTqeWCBRBeD3Y5pFM/4 icXYcc7Q21sbWdRoHjGKn+59F62HP7TIiWSaCJ1kG8kbsdbwkzv3AO2RuGnEXmVm9Xn9 S0OFGDRNcHHyr+SrxcvR5O64YGZVHUEsdj2riyFukCOB8exWMeWNpnqXotNMQN3HRtGb u3UQ== X-Gm-Message-State: AA6/9RkYZLUjx5w/8x0UxHPWYCtn/BhpCghYIDKUMRHmJk896I+PDPAgrIlVXG7maXzF9A== X-Received: by 10.194.147.48 with SMTP id th16mr894747wjb.68.1476272911769; Wed, 12 Oct 2016 04:48:31 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id ma5sm12179819wjb.47.2016.10.12.04.48.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Oct 2016 04:48:30 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 12 Oct 2016 12:48:27 +0100 Message-Id: <20161012114827.17031-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161012114827.17031-1-chris@chris-wilson.co.uk> References: <20161012114827.17031-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 2/2] drm/i915: Update debugfs describe_obj() to show fault-mappable 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 The current meaning of whether an object has a GGTT vma is very ill-defined (and note we don't check for any partials either), it just means that at some point it was in the GGTT but it may not be now. The information we really care about here is whether it is taking up precious mappable aperture space. This is the obj->fault_mappable flag. We have a redundant long form reprinting of this information, so remove that in favour of the compact flag. Signed-off-by: Chris Wilson Reviewed-by: Joonas Lahtinen --- drivers/gpu/drm/i915/i915_debugfs.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 358663e833d6..2e312e0f2670 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -107,7 +107,7 @@ static char get_tiling_flag(struct drm_i915_gem_object *obj) static char get_global_flag(struct drm_i915_gem_object *obj) { - return i915_gem_object_to_ggtt(obj, NULL) ? 'g' : ' '; + return obj->fault_mappable ? 'g' : ' '; } static char get_pin_mapped_flag(struct drm_i915_gem_object *obj) @@ -186,15 +186,6 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) } if (obj->stolen) seq_printf(m, " (stolen: %08llx)", obj->stolen->start); - if (obj->pin_display || obj->fault_mappable) { - char s[3], *t = s; - if (obj->pin_display) - *t++ = 'p'; - if (obj->fault_mappable) - *t++ = 'f'; - *t = '\0'; - seq_printf(m, " (%s mappable)", s); - } engine = i915_gem_active_get_engine(&obj->last_write, &dev_priv->drm.struct_mutex);