From patchwork Sat Jul 22 09:53:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9858065 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 3EE57600F5 for ; Sat, 22 Jul 2017 09:56:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28E3A285ED for ; Sat, 22 Jul 2017 09:56:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D591285F5; Sat, 22 Jul 2017 09:56:17 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 82B25285ED for ; Sat, 22 Jul 2017 09:56:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 584836E92E; Sat, 22 Jul 2017 09:55:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 161AD6E92A; Sat, 22 Jul 2017 09:55:27 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id 12so5772788wrb.4; Sat, 22 Jul 2017 02:55:27 -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; bh=V8cxv4wyLpEoc9+CiidRu1e1D3+Lm7q2o4PCVElQlUg=; b=T2JHC+Fa8UNBpP1LuLPw91pixiIMM/U3JVDv3RQ4jFaA3T4XzVcaZjWu0SO5NPc3ND RXCRAOjOuiRiAE5ciDvQ6Onq0JkdqK/V3Pc5upXKHU0rS1Jdnh8N4Ci3kLLc8H804OZW 7raBOAujGxWYHed7b1SGwlS4qdDP0OpPoLqxgk2TBqKVHjFO9+9KU0HzNVz/KUNEQ3OF /5VKrgXuG9JY20hIhMYqBC5P7zFxv2SkAxc8VuzpA5HeoQmqnuCIiOv12zHuScWYTMo6 ZHXz6yMe3ft3Dswdv0k6C10iUpVn7LxkdTc4i5x3n8ySYdVwCsHQo8XFqwsVh8YdXD5N LQmw== 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=V8cxv4wyLpEoc9+CiidRu1e1D3+Lm7q2o4PCVElQlUg=; b=N60AukItyZ2NvijtJLNATmRiB614+j77mTxARgs+VliQ4dOO4YzrICa4xIw1IBS9T+ AKrS2Oj+t2xTbRxLj9llQbzQ5YW+RBoWmEGwW/PLzHVPeqiNu5IBFPlmnQtdZIQHEzU9 +wBCrA4KSCiAdAibL7F4KotNy8aneJZjXvspZ/JvR5vcXJPsvZ/ojlwAKOLerjlM7SJ4 l+ZOdlnkMXc8hdA9rixf90ommNi64plkNhZ8Jm+b1Av5yFcaUvYU4mUhBE7/PC2o8IVA 0Po55Nz6RuA6fkWCbrwL3A1XaBDjt2WiPEILMG5uQZ3BiAGa8fq84fBEKshwt9AzrkfP wpBw== X-Gm-Message-State: AIVw112EoSKzk5Pad2EBUsZA6OUAQ0cgL+6XSQuFcVRPuBYRp0go+8T/ oe3EGAjpHYO8/ynM X-Received: by 10.223.166.173 with SMTP id t42mr8040701wrc.272.1500717325451; Sat, 22 Jul 2017 02:55:25 -0700 (PDT) Received: from cp720.fritz.box (91-114-193-248.adsl.highway.telekom.at. [91.114.193.248]) by smtp.gmail.com with ESMTPSA id z192sm2544673wmz.44.2017.07.22.02.55.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 22 Jul 2017 02:55:24 -0700 (PDT) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH V2 15/23] drm/etnaviv: add SH perf domain Date: Sat, 22 Jul 2017 11:53:15 +0200 Message-Id: <20170722095323.9964-16-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170722095323.9964-1-christian.gmeiner@gmail.com> References: <20170722095323.9964-1-christian.gmeiner@gmail.com> Cc: linux+etnaviv@armlinux.org.uk, etnaviv@lists.freedesktop.org, cphealy@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Changes from v1 -> v2: - all SH perf counters are accessed via perf_reg_read(..) Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 53 +++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c index 5d7ff5c25268..2b2470761920 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c @@ -147,6 +147,59 @@ static const struct etnaviv_pm_domain doms[] = { &pipe_reg_read } } + }, + { + .name = "SH", + .profile_read = VIVS_MC_PROFILE_SH_READ, + .profile_config = VIVS_MC_PROFILE_CONFIG0, + .nr_signals = 9, + .signal = (const struct etnaviv_pm_signal[]) { + { + "SHADER_CYCLES", + VIVS_MC_PROFILE_CONFIG0_SH_SHADER_CYCLES, + &perf_reg_read + }, + { + "PS_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_PS_INST_COUNTER, + &perf_reg_read + }, + { + "RENDERED_PIXEL_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_RENDERED_PIXEL_COUNTER, + &perf_reg_read + }, + { + "VS_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_VS_INST_COUNTER, + &perf_reg_read + }, + { + "RENDERED_VERTICE_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_RENDERED_VERTICE_COUNTER, + &perf_reg_read + }, + { + "VTX_BRANCH_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_VTX_BRANCH_INST_COUNTER, + &perf_reg_read + }, + { + "VTX_TEXLD_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_VTX_TEXLD_INST_COUNTER, + &perf_reg_read + }, + { + "PXL_BRANCH_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_PXL_BRANCH_INST_COUNTER, + &perf_reg_read + }, + { + "PXL_TEXLD_INST_COUNTER", + VIVS_MC_PROFILE_CONFIG0_SH_PXL_TEXLD_INST_COUNTER, + &perf_reg_read + } + } } };