From patchwork Wed Jun 20 20:48:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10478699 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 5D55B60230 for ; Wed, 20 Jun 2018 20:48:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E7CB28390 for ; Wed, 20 Jun 2018 20:48:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43052283D1; Wed, 20 Jun 2018 20:48:53 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D81DC28390 for ; Wed, 20 Jun 2018 20:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933217AbeFTUsv (ORCPT ); Wed, 20 Jun 2018 16:48:51 -0400 Received: from mail-yb0-f194.google.com ([209.85.213.194]:33232 "EHLO mail-yb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933283AbeFTUsu (ORCPT ); Wed, 20 Jun 2018 16:48:50 -0400 Received: by mail-yb0-f194.google.com with SMTP id e84-v6so370775ybb.0 for ; Wed, 20 Jun 2018 13:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WSL4/8y9kQxYUiOmXBSSaEsbE/KSDSwL+qgS+KRgV18=; b=KhQjvzwggYYTgBURqS146hGLUSIrbzUu9h9P/+imhp4NVL92E6J0l16E9VqH9h0IoB 6TP6i8F7B5FikwFvMG1dX9gi5W45BszxYJmlqZYtV6HR3tGl2Xafx4hEp2V1lxkQOLC+ SDbkZ9jx36IFjjHVtCNLBQJf8k1Ful6dzFClE= 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; bh=WSL4/8y9kQxYUiOmXBSSaEsbE/KSDSwL+qgS+KRgV18=; b=i7h+o56RdkX7G2LeTtPBimuD6I1tzJAS2m1kfSi2TP8zRsum33vZIcSyc94uUzxP9d gZrB88vSn3uXWXEHFzYNQN5w8nCamlfyd43xkqCtWLNCYVB7dCisRfU+Y3Cr350h2c9k tAQ+ODVZM3mMRuW6HvD468xzow69V6tQMW3xtz0EgQOXF4NkuM+CGyh0k04LpIeaxO79 aweN+GTaZZsGIqogZrBdehjhMvOQTkQYoboB0ObpMqQW0LMy1Kq3trXNvMetEsMaZGze 2tdSIaSiTeqSw/XkDNG90nPv7KuOmB2wfHlVbFVOIZXADJw7Yn/2AhgoXicpwcTJEW5c XuPg== X-Gm-Message-State: APt69E1hxrFMqe/gJlOirHqnF2jHuI68Yn18ViqTsRDHA5YzhLn9fpER IsgZtlm3GqA6iJvp29Is2DAb5Q== X-Google-Smtp-Source: ADUXVKL0dwpmStdAotUKOMDmXnloQcC4LPbOO4BIJjGdDBXWEQdUDVMbE224sfUK1vd366JR1hYCtA== X-Received: by 2002:a5b:188:: with SMTP id r8-v6mr5258106ybl.201.1529527729697; Wed, 20 Jun 2018 13:48:49 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id p3-v6sm1173865ywh.36.2018.06.20.13.48.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 13:48:49 -0700 (PDT) From: Sean Paul To: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: robdclark@gmail.com, hoegsberg@chromium.org, jsanka@codeaurora.org, abhinavk@codeaurora.org, Sean Paul Subject: [DPU PATCH 08/19] drm/msm: dpu_vbif: Replace DPU_EVT with tracepoints Date: Wed, 20 Jun 2018 16:48:30 -0400 Message-Id: <20180620204841.56354-9-seanpaul@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180620204841.56354-1-seanpaul@chromium.org> References: <20180620204841.56354-1-seanpaul@chromium.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch converts all DPU_EVTs in dpu_vbif with either a DRM_* log message or a linux tracepoint. Signed-off-by: Sean Paul Reviewed-by: Rajesh Yadav --- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 15 +++++++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 7 +++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h index c9041e2a7aa1..73f76387803f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -20,6 +20,7 @@ #include "dpu_crtc.h" #include "dpu_encoder_phys.h" #include "dpu_hw_mdss.h" +#include "dpu_hw_vbif.h" #include "dpu_plane.h" #undef TRACE_SYSTEM @@ -937,6 +938,20 @@ TRACE_EVENT(dpu_rm_reserve_lms, __entry->type, __entry->enc_id, __entry->pp_id) ); +TRACE_EVENT(dpu_vbif_wait_xin_halt_fail, + TP_PROTO(enum dpu_vbif index, u32 xin_id), + TP_ARGS(index, xin_id), + TP_STRUCT__entry( + __field( enum dpu_vbif, index ) + __field( u32, xin_id ) + ), + TP_fast_assign( + __entry->index = index; + __entry->xin_id = xin_id; + ), + TP_printk("index:%d xin_id:%u", __entry->index, __entry->xin_id) +); + #define DPU_ATRACE_END(name) trace_tracing_mark_write(current->tgid, name, 0) #define DPU_ATRACE_BEGIN(name) trace_tracing_mark_write(current->tgid, name, 1) #define DPU_ATRACE_FUNC() DPU_ATRACE_BEGIN(__func__) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c index 801155fe0989..295528292296 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c @@ -204,7 +204,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, ret = _dpu_vbif_wait_for_xin_halt(vbif, params->xin_id); if (ret) - DPU_EVT32(vbif->idx, params->xin_id); + trace_dpu_vbif_wait_xin_halt_fail(vbif->idx, params->xin_id); vbif->ops.set_halt_ctrl(vbif, params->xin_id, false); @@ -284,9 +284,8 @@ void dpu_vbif_clear_errors(struct dpu_kms *dpu_kms) if (vbif && vbif->ops.clear_errors) { vbif->ops.clear_errors(vbif, &pnd, &src); if (pnd || src) { - DPU_EVT32(i, pnd, src); - DPU_DEBUG("VBIF %d: pnd 0x%X, src 0x%X\n", - vbif->idx - VBIF_0, pnd, src); + DRM_DEBUG_KMS("VBIF %d: pnd 0x%X, src 0x%X\n", + vbif->idx - VBIF_0, pnd, src); } } }