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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 C4CC2C47404 for ; Mon, 7 Oct 2019 20:35:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97C6C21479 for ; Mon, 7 Oct 2019 20:35:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ToO/RKWq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728212AbfJGUfj (ORCPT ); Mon, 7 Oct 2019 16:35:39 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45957 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728187AbfJGUfi (ORCPT ); Mon, 7 Oct 2019 16:35:38 -0400 Received: by mail-pf1-f196.google.com with SMTP id y72so9349638pfb.12; Mon, 07 Oct 2019 13:35:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CqfvJ5pvQPXk0BHnC/qiO7SxY725BiWlCHyn+q4BOxc=; b=ToO/RKWqkLaXMfa+snaXo9WKFKvpYC1NfRgs4c/h85/8LQmRMMP7WIwrafm0v2mEXK pv6Qb21fzchRVOgFzQWuwXbldwIZE37+0mbjGol0bwP+Wb8wdWeyXV4B/GFCX4jH+GMA P9MY0XNkRzbAzkgZuE0LWDERaLivykyGf+D8y+f28XzdibEKlDT2V6gJkJMtw+JCKSCR nzhUFw4nmOEx2eA6FUw6kwpABWh6mP01CuhPBkQ7rcpozRZSG4FvxYqOYDkl8PMK7Lr9 2PM/Ngfkzmw2nqzTIS0uyJhb+Bc2C/8XB9wnu3CRu/Wtc9xdsfI6aVSgwVdVWQn8/F/i UDhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CqfvJ5pvQPXk0BHnC/qiO7SxY725BiWlCHyn+q4BOxc=; b=dOwlSrZ7+o7CxsxvWH26rsM3eiwa7TTg/q6Q1GWdHYROs+qIzf1+pi770ukyMOKQPl SLDgtgpHA+zMGoZaITUZYvQkqBvTbtftopIlx5qR53GYgUCg7OY9jyYkC6VTclUZzxtO W4GKhjElSrncJbtq+pkeYgO0DzukpahHWAJ1sZplbGMKzEc3qEXy2BIU2qXA1ku1kgOy L5WbGm5Y464mcnbZVYZgf7aJzYOU64Z1MSJJWwL+f0mABNunrV4tZ4sEqnzQo5OLIlvh 7V8An8dzj5maD5x0Dy48wfk1UjMmfnkzf50KznWzzcyJu+9WJXwd643XYzhlEJ8s2x9W qT2g== X-Gm-Message-State: APjAAAUNd6W5G2BHONt7d5nsWCxVaLmn/1NLuMrDsJKXd8JJaA3BoCOD DxOTbz0CFRD3IgmGQ/OxNSc= X-Google-Smtp-Source: APXvYqwdvdnGsnyePeqeHBTBNU74U6yfa020DAsY08IaRi36nJv8u4329HayFHYz+95BFWYxqkzUwA== X-Received: by 2002:a63:f957:: with SMTP id q23mr170715pgk.81.1570480538059; Mon, 07 Oct 2019 13:35:38 -0700 (PDT) Received: from localhost ([100.118.89.196]) by smtp.gmail.com with ESMTPSA id q20sm20502851pfl.79.2019.10.07.13.35.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 13:35:37 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org, Rob Clark , Rob Clark , Sean Paul , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/2] drm/msm: always dump buffer base/size Date: Mon, 7 Oct 2019 13:31:08 -0700 Message-Id: <20191007203108.18667-2-robdclark@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191007203108.18667-1-robdclark@gmail.com> References: <20191007203108.18667-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Rob Clark Even if we are not dumping the buffer's contents, it is useful to log their base address and size. This makes it easier to see when different gpu pointers point to a single buffer, for example higher mipmap levels of a single texture. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_rd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index f8f654301def..0896419ed95d 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -295,7 +295,7 @@ void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) static void snapshot_buf(struct msm_rd_state *rd, struct msm_gem_submit *submit, int idx, - uint64_t iova, uint32_t size) + uint64_t iova, uint32_t size, bool full) { struct msm_gem_object *obj = submit->bos[idx].obj; unsigned offset = 0; @@ -315,6 +315,9 @@ static void snapshot_buf(struct msm_rd_state *rd, rd_write_section(rd, RD_GPUADDR, (uint32_t[3]){ iova, size, iova >> 32 }, 12); + if (!full) + return; + /* But only dump the contents of buffers marked READ */ if (!(submit->bos[idx].flags & MSM_SUBMIT_BO_READ)) return; @@ -378,8 +381,7 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, rd_write_section(rd, RD_CMD, msg, ALIGN(n, 4)); for (i = 0; i < submit->nr_bos; i++) - if (should_dump(submit, i)) - snapshot_buf(rd, submit, i, 0, 0); + snapshot_buf(rd, submit, i, 0, 0, should_dump(submit, i)); for (i = 0; i < submit->nr_cmds; i++) { uint32_t szd = submit->cmd[i].size; /* in dwords */ @@ -387,7 +389,7 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, /* snapshot cmdstream bo's (if we haven't already): */ if (!should_dump(submit, i)) { snapshot_buf(rd, submit, submit->cmd[i].idx, - submit->cmd[i].iova, szd * 4); + submit->cmd[i].iova, szd * 4, true); } } -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH 2/2] drm/msm: always dump buffer base/size Date: Mon, 7 Oct 2019 13:31:08 -0700 Message-ID: <20191007203108.18667-2-robdclark@gmail.com> References: <20191007203108.18667-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191007203108.18667-1-robdclark@gmail.com> 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: Rob Clark , David Airlie , freedreno@lists.freedesktop.org, open list , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogUm9iIENsYXJrIDxyb2JkY2xhcmtAY2hyb21pdW0ub3JnPgoKRXZlbiBpZiB3ZSBhcmUg bm90IGR1bXBpbmcgdGhlIGJ1ZmZlcidzIGNvbnRlbnRzLCBpdCBpcyB1c2VmdWwgdG8gbG9nCnRo ZWlyIGJhc2UgYWRkcmVzcyBhbmQgc2l6ZS4gIFRoaXMgbWFrZXMgaXQgZWFzaWVyIHRvIHNlZSB3 aGVuIGRpZmZlcmVudApncHUgcG9pbnRlcnMgcG9pbnQgdG8gYSBzaW5nbGUgYnVmZmVyLCBmb3Ig ZXhhbXBsZSBoaWdoZXIgbWlwbWFwIGxldmVscwpvZiBhIHNpbmdsZSB0ZXh0dXJlLgoKU2lnbmVk LW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtAY2hyb21pdW0ub3JnPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9tc20vbXNtX3JkLmMgfCAxMCArKysrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBp bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tc20vbXNtX3JkLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9yZC5jCmluZGV4IGY4ZjY1 NDMwMWRlZi4uMDg5NjQxOWVkOTVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21z bV9yZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX3JkLmMKQEAgLTI5NSw3ICsyOTUs NyBAQCB2b2lkIG1zbV9yZF9kZWJ1Z2ZzX2NsZWFudXAoc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAq cHJpdikKIAogc3RhdGljIHZvaWQgc25hcHNob3RfYnVmKHN0cnVjdCBtc21fcmRfc3RhdGUgKnJk LAogCQlzdHJ1Y3QgbXNtX2dlbV9zdWJtaXQgKnN1Ym1pdCwgaW50IGlkeCwKLQkJdWludDY0X3Qg aW92YSwgdWludDMyX3Qgc2l6ZSkKKwkJdWludDY0X3QgaW92YSwgdWludDMyX3Qgc2l6ZSwgYm9v bCBmdWxsKQogewogCXN0cnVjdCBtc21fZ2VtX29iamVjdCAqb2JqID0gc3VibWl0LT5ib3NbaWR4 XS5vYmo7CiAJdW5zaWduZWQgb2Zmc2V0ID0gMDsKQEAgLTMxNSw2ICszMTUsOSBAQCBzdGF0aWMg dm9pZCBzbmFwc2hvdF9idWYoc3RydWN0IG1zbV9yZF9zdGF0ZSAqcmQsCiAJcmRfd3JpdGVfc2Vj dGlvbihyZCwgUkRfR1BVQUREUiwKIAkJCSh1aW50MzJfdFszXSl7IGlvdmEsIHNpemUsIGlvdmEg Pj4gMzIgfSwgMTIpOwogCisJaWYgKCFmdWxsKQorCQlyZXR1cm47CisKIAkvKiBCdXQgb25seSBk dW1wIHRoZSBjb250ZW50cyBvZiBidWZmZXJzIG1hcmtlZCBSRUFEICovCiAJaWYgKCEoc3VibWl0 LT5ib3NbaWR4XS5mbGFncyAmIE1TTV9TVUJNSVRfQk9fUkVBRCkpCiAJCXJldHVybjsKQEAgLTM3 OCw4ICszODEsNyBAQCB2b2lkIG1zbV9yZF9kdW1wX3N1Ym1pdChzdHJ1Y3QgbXNtX3JkX3N0YXRl ICpyZCwgc3RydWN0IG1zbV9nZW1fc3VibWl0ICpzdWJtaXQsCiAJcmRfd3JpdGVfc2VjdGlvbihy ZCwgUkRfQ01ELCBtc2csIEFMSUdOKG4sIDQpKTsKIAogCWZvciAoaSA9IDA7IGkgPCBzdWJtaXQt Pm5yX2JvczsgaSsrKQotCQlpZiAoc2hvdWxkX2R1bXAoc3VibWl0LCBpKSkKLQkJCXNuYXBzaG90 X2J1ZihyZCwgc3VibWl0LCBpLCAwLCAwKTsKKwkJc25hcHNob3RfYnVmKHJkLCBzdWJtaXQsIGks IDAsIDAsIHNob3VsZF9kdW1wKHN1Ym1pdCwgaSkpOwogCiAJZm9yIChpID0gMDsgaSA8IHN1Ym1p dC0+bnJfY21kczsgaSsrKSB7CiAJCXVpbnQzMl90IHN6ZCAgPSBzdWJtaXQtPmNtZFtpXS5zaXpl OyAvKiBpbiBkd29yZHMgKi8KQEAgLTM4Nyw3ICszODksNyBAQCB2b2lkIG1zbV9yZF9kdW1wX3N1 Ym1pdChzdHJ1Y3QgbXNtX3JkX3N0YXRlICpyZCwgc3RydWN0IG1zbV9nZW1fc3VibWl0ICpzdWJt aXQsCiAJCS8qIHNuYXBzaG90IGNtZHN0cmVhbSBibydzIChpZiB3ZSBoYXZlbid0IGFscmVhZHkp OiAqLwogCQlpZiAoIXNob3VsZF9kdW1wKHN1Ym1pdCwgaSkpIHsKIAkJCXNuYXBzaG90X2J1Zihy ZCwgc3VibWl0LCBzdWJtaXQtPmNtZFtpXS5pZHgsCi0JCQkJCXN1Ym1pdC0+Y21kW2ldLmlvdmEs IHN6ZCAqIDQpOworCQkJCQlzdWJtaXQtPmNtZFtpXS5pb3ZhLCBzemQgKiA0LCB0cnVlKTsKIAkJ fQogCX0KIAotLSAKMi4yMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWw=