From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 4/4] drm/v3d: Skip debugfs dumping GCA on platforms without GCA. Date: Fri, 28 Sep 2018 16:21:26 -0700 Message-ID: <20180928232126.4332-4-eric@anholt.net> References: <20180928232126.4332-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 354C06E0DF for ; Fri, 28 Sep 2018 23:21:32 +0000 (UTC) In-Reply-To: <20180928232126.4332-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: boris.brezillon@bootlin.com, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Rml4ZXMgYW4gb29wcyByZWFkaW5nIHRoaXMgZGVidWdmcyBlbnRyeSBvbiBCQ003Mjc4LgoKU2ln bmVkLW9mZi1ieTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vdjNkL3YzZF9kZWJ1Z2ZzLmMgfCAxMSArKysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQs IDcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdjNkL3YzZF9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9kZWJ1Z2Zz LmMKaW5kZXggZDQ4MDA4YWRiMDg1Li5lYjJiMmQyZjg1NTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS92M2QvdjNkX2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdjNkL3YzZF9k ZWJ1Z2ZzLmMKQEAgLTcxLDEwICs3MSwxMyBAQCBzdGF0aWMgaW50IHYzZF92M2RfZGVidWdmc19y ZWdzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJICAgVjNEX1JFQUQodjNk X2h1Yl9yZWdfZGVmc1tpXS5yZWcpKTsKIAl9CiAKLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la RSh2M2RfZ2NhX3JlZ19kZWZzKTsgaSsrKSB7Ci0JCXNlcV9wcmludGYobSwgIiVzICgweCUwNHgp OiAweCUwOHhcbiIsCi0JCQkgICB2M2RfZ2NhX3JlZ19kZWZzW2ldLm5hbWUsIHYzZF9nY2FfcmVn X2RlZnNbaV0ucmVnLAotCQkJICAgVjNEX0dDQV9SRUFEKHYzZF9nY2FfcmVnX2RlZnNbaV0ucmVn KSk7CisJaWYgKHYzZC0+dmVyIDwgNDEpIHsKKwkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUo djNkX2djYV9yZWdfZGVmcyk7IGkrKykgeworCQkJc2VxX3ByaW50ZihtLCAiJXMgKDB4JTA0eCk6 IDB4JTA4eFxuIiwKKwkJCQkgICB2M2RfZ2NhX3JlZ19kZWZzW2ldLm5hbWUsCisJCQkJICAgdjNk X2djYV9yZWdfZGVmc1tpXS5yZWcsCisJCQkJICAgVjNEX0dDQV9SRUFEKHYzZF9nY2FfcmVnX2Rl ZnNbaV0ucmVnKSk7CisJCX0KIAl9CiAKIAlmb3IgKGNvcmUgPSAwOyBjb3JlIDwgdjNkLT5jb3Jl czsgY29yZSsrKSB7Ci0tIAoyLjE4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EC89C004D2 for ; Fri, 28 Sep 2018 23:21:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1836206B6 for ; Fri, 28 Sep 2018 23:21:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1836206B6 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=anholt.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727781AbeI2Frn (ORCPT ); Sat, 29 Sep 2018 01:47:43 -0400 Received: from anholt.net ([50.246.234.109]:45464 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727401AbeI2Frd (ORCPT ); Sat, 29 Sep 2018 01:47:33 -0400 Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 105A710A1AED; Fri, 28 Sep 2018 16:21:32 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id z0gbsOGzIDem; Fri, 28 Sep 2018 16:21:31 -0700 (PDT) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 18DE310A1AE7; Fri, 28 Sep 2018 16:21:28 -0700 (PDT) Received: by eliezer.anholt.net (Postfix, from userid 1000) id EE0DC2FE1B43; Fri, 28 Sep 2018 16:21:26 -0700 (PDT) From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, boris.brezillon@bootlin.com, Eric Anholt Subject: [PATCH 4/4] drm/v3d: Skip debugfs dumping GCA on platforms without GCA. Date: Fri, 28 Sep 2018 16:21:26 -0700 Message-Id: <20180928232126.4332-4-eric@anholt.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180928232126.4332-1-eric@anholt.net> References: <20180928232126.4332-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixes an oops reading this debugfs entry on BCM7278. Signed-off-by: Eric Anholt --- drivers/gpu/drm/v3d/v3d_debugfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c index d48008adb085..eb2b2d2f8553 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -71,10 +71,13 @@ static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused) V3D_READ(v3d_hub_reg_defs[i].reg)); } - for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) { - seq_printf(m, "%s (0x%04x): 0x%08x\n", - v3d_gca_reg_defs[i].name, v3d_gca_reg_defs[i].reg, - V3D_GCA_READ(v3d_gca_reg_defs[i].reg)); + if (v3d->ver < 41) { + for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) { + seq_printf(m, "%s (0x%04x): 0x%08x\n", + v3d_gca_reg_defs[i].name, + v3d_gca_reg_defs[i].reg, + V3D_GCA_READ(v3d_gca_reg_defs[i].reg)); + } } for (core = 0; core < v3d->cores; core++) { -- 2.18.0