From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH 4/6] drm/msm/rd: allow adding addition msg to top of dump Date: Tue, 24 Oct 2017 09:22:51 -0400 Message-ID: <20171024132256.20286-5-robdclark@gmail.com> References: <20171024132256.20286-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171024132256.20286-1-robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: David Airlie , linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Rob Clark , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Jordan Crouse , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org Rm9yIGZhdWx0cyBvciBoYW5ncywgaXQgaXMgbmljZSB0byBiZSBhYmxlIHRvIGluY2x1ZGUgYSBi aXQgbW9yZQppbmZvcm1hdGlvbi4KClNpZ25lZC1vZmYtYnk6IFJvYiBDbGFyayA8cm9iZGNsYXJr QGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaCB8ICAzICsrLQog ZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL21z bS9tc21fcmQuYyAgfCAxNSArKysrKysrKysrKysrLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTYgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2Rydi5oCmluZGV4IGIwMWJk N2ZhOWMyYi4uYTAwN2JiZjRkOTRkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL21z bV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9kcnYuaApAQCAtMjk5LDcgKzI5 OSw4IEBAIHZvaWQgbXNtX2ZyYW1lYnVmZmVyX2Rlc2NyaWJlKHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiLCBzdHJ1Y3Qgc2VxX2ZpbGUgKm0pOwogaW50IG1zbV9kZWJ1Z2ZzX2xhdGVfaW5pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIGludCBtc21fcmRfZGVidWdmc19pbml0KHN0cnVjdCBk cm1fbWlub3IgKm1pbm9yKTsKIHZvaWQgbXNtX3JkX2RlYnVnZnNfY2xlYW51cChzdHJ1Y3QgbXNt X2RybV9wcml2YXRlICpwcml2KTsKLXZvaWQgbXNtX3JkX2R1bXBfc3VibWl0KHN0cnVjdCBtc21f cmRfc3RhdGUgKnJkLCBzdHJ1Y3QgbXNtX2dlbV9zdWJtaXQgKnN1Ym1pdCk7Cit2b2lkIG1zbV9y ZF9kdW1wX3N1Ym1pdChzdHJ1Y3QgbXNtX3JkX3N0YXRlICpyZCwgc3RydWN0IG1zbV9nZW1fc3Vi bWl0ICpzdWJtaXQsCisJCWNvbnN0IGNoYXIgKmZtdCwgLi4uKTsKIGludCBtc21fcGVyZl9kZWJ1 Z2ZzX2luaXQoc3RydWN0IGRybV9taW5vciAqbWlub3IpOwogdm9pZCBtc21fcGVyZl9kZWJ1Z2Zz X2NsZWFudXAoc3RydWN0IG1zbV9kcm1fcHJpdmF0ZSAqcHJpdik7CiAjZWxzZQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21z bV9ncHUuYwppbmRleCA1YmFlYjM0ZjA5OGUuLjQwM2JhZWExOTMyOSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21f Z3B1LmMKQEAgLTU1Niw3ICs1NTYsNyBAQCB2b2lkIG1zbV9ncHVfc3VibWl0KHN0cnVjdCBtc21f Z3B1ICpncHUsIHN0cnVjdCBtc21fZ2VtX3N1Ym1pdCAqc3VibWl0LAogCiAJbGlzdF9hZGRfdGFp bCgmc3VibWl0LT5ub2RlLCAmcmluZy0+c3VibWl0cyk7CiAKLQltc21fcmRfZHVtcF9zdWJtaXQo cHJpdi0+cmQsIHN1Ym1pdCk7CisJbXNtX3JkX2R1bXBfc3VibWl0KHByaXYtPnJkLCBzdWJtaXQs IE5VTEwpOwogCiAJdXBkYXRlX3N3X2NudHJzKGdwdSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9tc20vbXNtX3JkLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9yZC5jCmluZGV4 IGQ2ODk0MDdjODA5YS4uM2FhOGE4NTc2YWJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v bXNtL21zbV9yZC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX3JkLmMKQEAgLTM0Niwx MSArMzQ2LDEyIEBAIHN0YXRpYyB2b2lkIHNuYXBzaG90X2J1ZihzdHJ1Y3QgbXNtX3JkX3N0YXRl ICpyZCwKIH0KIAogLyogY2FsbGVkIHVuZGVyIHN0cnVjdF9tdXRleCAqLwotdm9pZCBtc21fcmRf ZHVtcF9zdWJtaXQoc3RydWN0IG1zbV9yZF9zdGF0ZSAqcmQsIHN0cnVjdCBtc21fZ2VtX3N1Ym1p dCAqc3VibWl0KQordm9pZCBtc21fcmRfZHVtcF9zdWJtaXQoc3RydWN0IG1zbV9yZF9zdGF0ZSAq cmQsIHN0cnVjdCBtc21fZ2VtX3N1Ym1pdCAqc3VibWl0LAorCQljb25zdCBjaGFyICpmbXQsIC4u LikKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3VibWl0LT5kZXY7CiAJc3RydWN0IHRh c2tfc3RydWN0ICp0YXNrOwotCWNoYXIgbXNnWzEyOF07CisJY2hhciBtc2dbMjU2XTsKIAlpbnQg aSwgbjsKIAogCWlmICghcmQtPm9wZW4pCkBAIC0zNjEsNiArMzYyLDE2IEBAIHZvaWQgbXNtX3Jk X2R1bXBfc3VibWl0KHN0cnVjdCBtc21fcmRfc3RhdGUgKnJkLCBzdHJ1Y3QgbXNtX2dlbV9zdWJt aXQgKnN1Ym1pdCkKIAkgKi8KIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJmRldi0+c3RydWN0 X211dGV4KSk7CiAKKwlpZiAoZm10KSB7CisJCXZhX2xpc3QgYXJnczsKKworCQl2YV9zdGFydChh cmdzLCBmbXQpOworCQluID0gdnNucHJpbnRmKG1zZywgc2l6ZW9mKG1zZyksIGZtdCwgYXJncyk7 CisJCXZhX2VuZChhcmdzKTsKKworCQlyZF93cml0ZV9zZWN0aW9uKHJkLCBSRF9DTUQsIG1zZywg QUxJR04obiwgNCkpOworCX0KKwogCXJjdV9yZWFkX2xvY2soKTsKIAl0YXNrID0gcGlkX3Rhc2so c3VibWl0LT5waWQsIFBJRFRZUEVfUElEKTsKIAlpZiAodGFzaykgewotLSAKMi4xMy42CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFp bGluZyBsaXN0CkZyZWVkcmVub0BsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9mcmVlZHJlbm8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934142AbdJXNXh (ORCPT ); Tue, 24 Oct 2017 09:23:37 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:54241 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934053AbdJXNXZ (ORCPT ); Tue, 24 Oct 2017 09:23:25 -0400 X-Google-Smtp-Source: ABhQp+S+AH+A8UPEXtosWVYtOWRliUh1sUPXytpaFCVJ+Lnt0rCyHi3tbb/2FfmgCKl2KnTbJyCBuw== From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Jordan Crouse , Rob Clark , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 4/6] drm/msm/rd: allow adding addition msg to top of dump Date: Tue, 24 Oct 2017 09:22:51 -0400 Message-Id: <20171024132256.20286-5-robdclark@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171024132256.20286-1-robdclark@gmail.com> References: <20171024132256.20286-1-robdclark@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For faults or hangs, it is nice to be able to include a bit more information. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/msm_drv.h | 3 ++- drivers/gpu/drm/msm/msm_gpu.c | 2 +- drivers/gpu/drm/msm/msm_rd.c | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index b01bd7fa9c2b..a007bbf4d94d 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -299,7 +299,8 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m); int msm_debugfs_late_init(struct drm_device *dev); int msm_rd_debugfs_init(struct drm_minor *minor); void msm_rd_debugfs_cleanup(struct msm_drm_private *priv); -void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit); +void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, + const char *fmt, ...); int msm_perf_debugfs_init(struct drm_minor *minor); void msm_perf_debugfs_cleanup(struct msm_drm_private *priv); #else diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 5baeb34f098e..403baea19329 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -556,7 +556,7 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, list_add_tail(&submit->node, &ring->submits); - msm_rd_dump_submit(priv->rd, submit); + msm_rd_dump_submit(priv->rd, submit, NULL); update_sw_cntrs(gpu); diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index d689407c809a..3aa8a8576abe 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c @@ -346,11 +346,12 @@ static void snapshot_buf(struct msm_rd_state *rd, } /* called under struct_mutex */ -void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit) +void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit, + const char *fmt, ...) { struct drm_device *dev = submit->dev; struct task_struct *task; - char msg[128]; + char msg[256]; int i, n; if (!rd->open) @@ -361,6 +362,16 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit) */ WARN_ON(!mutex_is_locked(&dev->struct_mutex)); + if (fmt) { + va_list args; + + va_start(args, fmt); + n = vsnprintf(msg, sizeof(msg), fmt, args); + va_end(args); + + rd_write_section(rd, RD_CMD, msg, ALIGN(n, 4)); + } + rcu_read_lock(); task = pid_task(submit->pid, PIDTYPE_PID); if (task) { -- 2.13.6