By registering the vic with actmon, engine load information can be exported to the user through debugfs for engine profiling purpose. Signed-off-by: Johnny Liu <johnliu@xxxxxxxxxx> --- drivers/gpu/drm/tegra/vic.c | 39 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/tegra/vic.h | 9 +++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c index 332c9b563d3f4..54c9b9b2af0a2 100644 --- a/drivers/gpu/drm/tegra/vic.c +++ b/drivers/gpu/drm/tegra/vic.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2015, NVIDIA Corporation. + * SPDX-FileCopyrightText: Copyright (c) 2015-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ #include <linux/clk.h> @@ -302,6 +302,28 @@ static int vic_load_firmware(struct vic *vic) return err; } +static void vic_actmon_reg_init(struct vic *vic) +{ + vic_writel(vic, + VIC_TFBIF_ACTMON_ACTIVE_MASK_STARVED | + VIC_TFBIF_ACTMON_ACTIVE_MASK_STALLED | + VIC_TFBIF_ACTMON_ACTIVE_MASK_DELAYED, + NV_PVIC_TFBIF_ACTMON_ACTIVE_MASK); + vic_writel(vic, + VIC_TFBIF_ACTMON_ACTIVE_BORPS_ACTIVE, + NV_PVIC_TFBIF_ACTMON_ACTIVE_BORPS); +} + +static void vic_count_weight_init(struct vic *vic, unsigned long rate) +{ + struct host1x_client *client = &vic->client.base; + u32 weight = 0; + + host1x_actmon_update_client_rate(client, rate, &weight); + + if (weight) + vic_writel(vic, weight, NV_PVIC_TFBIF_ACTMON_ACTIVE_WEIGHT); +} static int __maybe_unused vic_runtime_resume(struct device *dev) { @@ -328,6 +350,10 @@ static int __maybe_unused vic_runtime_resume(struct device *dev) if (err < 0) goto assert; + vic_actmon_reg_init(vic); + vic_count_weight_init(vic, clk_get_rate(vic->clk)); + host1x_actmon_enable(&vic->client.base); + return 0; assert: @@ -352,6 +378,8 @@ static int __maybe_unused vic_runtime_suspend(struct device *dev) clk_disable_unprepare(vic->clk); + host1x_actmon_disable(&vic->client.base); + return 0; } @@ -520,12 +548,20 @@ static int vic_probe(struct platform_device *pdev) goto exit_falcon; } + err = host1x_actmon_register(&vic->client.base); + if (err < 0) { + dev_info(&pdev->dev, "failed to register host1x actmon: %d\n", err); + goto exit_client; + } + pm_runtime_enable(dev); pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, 500); return 0; +exit_client: + host1x_client_unregister(&vic->client.base); exit_falcon: falcon_exit(&vic->falcon); @@ -537,6 +573,7 @@ static void vic_remove(struct platform_device *pdev) struct vic *vic = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev); + host1x_actmon_unregister(&vic->client.base); host1x_client_unregister(&vic->client.base); falcon_exit(&vic->falcon); } diff --git a/drivers/gpu/drm/tegra/vic.h b/drivers/gpu/drm/tegra/vic.h index acf35aac948b2..905cd7bfde2f6 100644 --- a/drivers/gpu/drm/tegra/vic.h +++ b/drivers/gpu/drm/tegra/vic.h @@ -21,6 +21,15 @@ #define CG_IDLE_CG_EN (1 << 6) #define CG_WAKEUP_DLY_CNT(val) ((val & 0xf) << 16) +#define NV_PVIC_TFBIF_ACTMON_ACTIVE_MASK 0x0000204c +#define NV_PVIC_TFBIF_ACTMON_ACTIVE_BORPS 0x00002050 +#define NV_PVIC_TFBIF_ACTMON_ACTIVE_WEIGHT 0x00002054 + +#define VIC_TFBIF_ACTMON_ACTIVE_MASK_STARVED BIT(0) +#define VIC_TFBIF_ACTMON_ACTIVE_MASK_STALLED BIT(1) +#define VIC_TFBIF_ACTMON_ACTIVE_MASK_DELAYED BIT(2) +#define VIC_TFBIF_ACTMON_ACTIVE_BORPS_ACTIVE BIT(7) + #define VIC_TFBIF_TRANSCFG 0x00002044 #define TRANSCFG_ATT(i, v) (((v) & 0x3) << (i * 4)) #define TRANSCFG_SID_HW 0 -- 2.34.1