From patchwork Fri Aug 25 09:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9921477 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 B9862603FA for ; Fri, 25 Aug 2017 09:08:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD21C27D16 for ; Fri, 25 Aug 2017 09:08:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1EA227E01; Fri, 25 Aug 2017 09:08:59 +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 745CE27D4A for ; Fri, 25 Aug 2017 09:08:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57EB76E82D; Fri, 25 Aug 2017 09:08:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id C00716E82B; Fri, 25 Aug 2017 09:07:58 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id p14so1091911wrg.4; Fri, 25 Aug 2017 02:07:58 -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=0Q9qrV0FBb1F95AZFzx01+mpsp33V1rXcIcGaNCYWEE=; b=uqoaIYDnfbX0DVRiHILpbr27yJtpJXQKNhxRFf1LQCZpQM8zCqQMmLp+tFU8njHV+P VmJEoo3IH8oMQs6Ji4xuQU04wyj/zJ5BI/p5LFSuLDqCCZiNudjh+xmULj9/08FEaLAy I8Zwu4sc1VBWQpMwq7HLrB710OfmS2xsrK+omQsO6W++OsEweI+6ooPmqL1jtyoOdKoF gOz8WLAzGRH8xn4ZRD/ahg1j9XwGuhFUNUSSd8epYEt3GaVaCx176TIGom2jUSILNvKH uo25EkV50w1/papO195S76UPckZ5UtqGeGsp1dSvL5VqDDbmgTTpz2vkZzodFH6GByLR QKuA== 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=0Q9qrV0FBb1F95AZFzx01+mpsp33V1rXcIcGaNCYWEE=; b=Dqlg0TeIxK+zo/QUV6CAuWJJJDBIPeilgUSbj6IXbZXBZzeQ9pherWDUxA86WCYji8 b/PjwWxCd0FugYZ/nCLZBPxQdiRiUMGDnek63TnGyS0nD5CjJ862e/+ZvflyBVYQgx8P ihUDucID96KNVh04pqCuHnsGeWDuFH0vvoWcsiHAjLtUd4xEvLYQ+lgtkzR6iybKDj5G EVJw/Y4Mbf6PAMetTNzanB7Tae+PoclMF5QBcsk6J8sGh/yqfUlvtB+3XGsjZN99pTke 3wHju+9aXpCAuNO6cHvf0OVm08SCXGW6wNhBdUngNuhyu1R349os3ZV/uO5wU4yb3lf9 jCEw== X-Gm-Message-State: AHYfb5hC0rUq8Z8r0Eb4r6Vrqui4oLKOkv0Yrq7HZQkADRMLXLPPwC4c 5tmKPt/ZPBUYHL24 X-Received: by 10.223.135.119 with SMTP id 52mr5364864wrz.141.1503652076982; Fri, 25 Aug 2017 02:07:56 -0700 (PDT) Received: from localhost.localdomain (93-82-124-36.adsl.highway.telekom.at. [93.82.124.36]) by smtp.gmail.com with ESMTPSA id 52sm5782547wrt.38.2017.08.25.02.07.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Aug 2017 02:07:55 -0700 (PDT) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH V3 13/23] drm/etnaviv: add HI perf domain Date: Fri, 25 Aug 2017 11:07:12 +0200 Message-Id: <20170825090722.14745-14-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170825090722.14745-1-christian.gmeiner@gmail.com> References: <20170825090722.14745-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 Signed-off-by: Christian Gmeiner --- drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c index a8518bd4fbf6..9079ffce9391 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c @@ -17,6 +17,7 @@ #include "etnaviv_gpu.h" #include "etnaviv_perfmon.h" +#include "state_hi.xml.h" struct etnaviv_pm_domain; @@ -31,11 +32,65 @@ struct etnaviv_pm_signal { struct etnaviv_pm_domain { char name[64]; + + /* profile register */ + u32 profile_read; + u32 profile_config; + u8 nr_signals; const struct etnaviv_pm_signal *signal; }; +static u32 simple_reg_read(struct etnaviv_gpu *gpu, + const struct etnaviv_pm_domain *domain, + const struct etnaviv_pm_signal *signal) +{ + return gpu_read(gpu, signal->data); +} + +static u32 perf_reg_read(struct etnaviv_gpu *gpu, + const struct etnaviv_pm_domain *domain, + const struct etnaviv_pm_signal *signal) +{ + gpu_write(gpu, domain->profile_config, signal->data); + + return gpu_read(gpu, domain->profile_read); +} + static const struct etnaviv_pm_domain doms[] = { + { + .name = "HI", + .profile_read = VIVS_MC_PROFILE_HI_READ, + .profile_config = VIVS_MC_PROFILE_CONFIG2, + .nr_signals = 5, + .signal = (const struct etnaviv_pm_signal[]) { + { + "TOTAL_CYCLES", + VIVS_HI_PROFILE_TOTAL_CYCLES, + &simple_reg_read + }, + { + "IDLE_CYCLES", + VIVS_HI_PROFILE_IDLE_CYCLES, + &simple_reg_read + }, + { + "AXI_CYCLES_READ_REQUEST_STALLED", + VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_READ_REQUEST_STALLED, + &perf_reg_read + }, + { + "AXI_CYCLES_WRITE_REQUEST_STALLED", + VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_REQUEST_STALLED, + &perf_reg_read + }, + { + "AXI_CYCLES_WRITE_DATA_STALLED", + VIVS_MC_PROFILE_CONFIG2_HI_AXI_CYCLES_WRITE_DATA_STALLED, + &perf_reg_read + } + } + } }; int etnaviv_pm_query_dom(struct etnaviv_gpu *gpu,