From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Rob Clark <robdclark@chromium.org>,
Jordan Crouse <jordan@cosmicpenguin.net>,
Sasha Levin <sashal@kernel.org>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.10 20/46] drm/msm: Fix a5xx/a6xx timestamps
Date: Mon, 12 Apr 2021 12:23:35 -0400 [thread overview]
Message-ID: <20210412162401.314035-20-sashal@kernel.org> (raw)
In-Reply-To: <20210412162401.314035-1-sashal@kernel.org>
From: Rob Clark <robdclark@chromium.org>
[ Upstream commit 9fbd3088351b92e8c2cef6e37a39decb12a8d5bb ]
They were reading a counter that was configured to ALWAYS_COUNT (ie.
cycles that the GPU is doing something) rather than ALWAYS_ON. This
isn't the thing that userspace is looking for.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Acked-by: Jordan Crouse <jordan@cosmicpenguin.net>
Message-Id: <20210325012358.1759770-2-robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 ++--
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index 5e11cdb207d8..0ca7e53db112 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1240,8 +1240,8 @@ static int a5xx_pm_suspend(struct msm_gpu *gpu)
static int a5xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)
{
- *value = gpu_read64(gpu, REG_A5XX_RBBM_PERFCTR_CP_0_LO,
- REG_A5XX_RBBM_PERFCTR_CP_0_HI);
+ *value = gpu_read64(gpu, REG_A5XX_RBBM_ALWAYSON_COUNTER_LO,
+ REG_A5XX_RBBM_ALWAYSON_COUNTER_HI);
return 0;
}
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 83b50f6d6bb7..722c2fe3bfd5 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -1073,8 +1073,8 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)
/* Force the GPU power on so we can read this register */
a6xx_gmu_set_oob(&a6xx_gpu->gmu, GMU_OOB_PERFCOUNTER_SET);
- *value = gpu_read64(gpu, REG_A6XX_RBBM_PERFCTR_CP_0_LO,
- REG_A6XX_RBBM_PERFCTR_CP_0_HI);
+ *value = gpu_read64(gpu, REG_A6XX_CP_ALWAYS_ON_COUNTER_LO,
+ REG_A6XX_CP_ALWAYS_ON_COUNTER_HI);
a6xx_gmu_clear_oob(&a6xx_gpu->gmu, GMU_OOB_PERFCOUNTER_SET);
mutex_unlock(&perfcounter_oob);
--
2.30.2
next prev parent reply other threads:[~2021-04-12 16:29 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 16:23 [PATCH AUTOSEL 5.10 01/46] net: ieee802154: fix nl802154 del llsec key Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 02/46] net: ieee802154: fix nl802154 del llsec dev Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 03/46] net: ieee802154: fix nl802154 add llsec key Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 04/46] net: ieee802154: fix nl802154 del llsec devkey Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 05/46] net: ieee802154: nl-mac: fix check on panid Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 06/46] ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 07/46] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 08/46] lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 09/46] arc: kernel: Return -EFAULT if copy_to_user() fails Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 10/46] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd() Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 11/46] xfrm: BEET mode doesn't support fragments for inner packets Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 12/46] ASoC: max98373: Changed amp shutdown register as volatile Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 13/46] ASoC: max98373: Added 30ms turn on/off time delay Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 14/46] gpu/xen: Fix a use after free in xen_drm_drv_init Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 15/46] neighbour: Disregard DEAD dst in neigh_update Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 16/46] ARM: keystone: fix integer overflow warning Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 17/46] ARM: omap1: fix building with clang IAS Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 18/46] drivers: net: fix memory leak in atusb_probe Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 19/46] drivers: net: fix memory leak in peak_usb_create_dev Sasha Levin
2021-04-12 16:23 ` Sasha Levin [this message]
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 21/46] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 22/46] scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 23/46] iwlwifi: add support for Qu with AX201 device Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 24/46] net: ieee802154: forbid monitor for set llsec params Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 25/46] net: ieee802154: stop dump llsec keys for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 26/46] net: ieee802154: forbid monitor for add llsec key Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 27/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 28/46] net: ieee802154: stop dump llsec devs for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 29/46] net: ieee802154: forbid monitor for add llsec dev Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 30/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 31/46] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 32/46] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 33/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 34/46] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 35/46] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 36/46] net: ieee802154: forbid monitor for del " Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 37/46] net: ieee802154: stop dump llsec params for monitors Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 38/46] net: mac802154: Fix general protection fault Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 39/46] pcnet32: Use pci_resource_len to validate PCI resource Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 40/46] net: tun: set tun->dev->addr_len during TUNSETLINK processing Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 41/46] net/rds: Avoid potential use after free in rds_send_remove_from_sock Sasha Levin
2021-04-19 8:49 ` Pavel Machek
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 42/46] net: tipc: Fix spelling errors in net/tipc module Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 43/46] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN Sasha Levin
2021-04-12 16:23 ` [PATCH AUTOSEL 5.10 44/46] cfg80211: remove WARN_ON() in cfg80211_sme_connect Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.10 45/46] virt_wifi: Return micros for BSS TSF values Sasha Levin
2021-04-12 16:24 ` [PATCH AUTOSEL 5.10 46/46] lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210412162401.314035-20-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jordan@cosmicpenguin.net \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).