drm/msm/gpu: Devfreq fixes+tuning
Subsystems (4)
cover drm/msm/gpu: Devfreq fixes+tuning
From: Rob Clark <[email protected]>
Rob Clark (3):
drm/msm/gpu: Add devfreq tuning debugfs drm/msm/gpu: Bypass PM QoS constraint for idle clamp drm/msm/gpu: Add default devfreq thresholds
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_debugfs.c | 12 +++ drivers/gpu/drm/msm/msm_drv.h | 9 ++ drivers/gpu/drm/msm/msm_gpu.h | 15 ++- drivers/gpu/drm/msm/msm_gpu_devfreq.c | 148 ++++++++++++-------------- 5 files changed, 99 insertions(+), 87 deletions(-)
Signature · 1 line
2.38.1
PATCH 1/3 drm/msm/gpu: Add devfreq tuning debugfs
From: Rob Clark <[email protected]>
Make the handful of tuning knobs available visible via debugfs.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_debugfs.c | 12 ++++++++++++ drivers/gpu/drm/msm/msm_drv.h | 9 +++++++++ drivers/gpu/drm/msm/msm_gpu.h | 3 --- drivers/gpu/drm/msm/msm_gpu_devfreq.c | 6 ++++-- 5 files changed, 26 insertions(+), 6 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -2021,7 +2021,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)* to cause power supply issues: */ if (adreno_is_a618 (adreno_gpu) ||adreno_is_7c3 (adreno_gpu)) - gpu->clamp_to_idle = true; + priv->gpu_clamp_to_idle = true;/* Check if there is a GMU phandle and set it up */ node =of_parse_phandle (pdev->dev.of_node,"qcom,gmu" ,0 );
drivers/gpu/drm/msm/msm_debugfs.c +12 -0
@@ -305,6 +305,7 @@ void msm_debugfs_init(struct drm_minor *minor) {struct drm_device *dev = minor->dev;struct msm_drm_private *priv = dev->dev_private; +struct dentry *gpu_devfreq; drm_debugfs_create_files(msm_debugfs_list, ARRAY_SIZE(msm_debugfs_list),
@@ -325,6 +326,17 @@ void msm_debugfs_init(struct drm_minor *minor)debugfs_create_file ("shrink" ,S_IRWXU , minor->debugfs_root, dev, &shrink_fops); + gpu_devfreq =debugfs_create_dir ("devfreq" , minor->debugfs_root); + +debugfs_create_bool ("idle_clamp" ,0600 , gpu_devfreq, + &priv->gpu_clamp_to_idle); + +debugfs_create_u32 ("upthreshold" ,0600 , gpu_devfreq, + &priv->gpu_devfreq_config.upthreshold); + +debugfs_create_u32 ("downdifferential" ,0600 , gpu_devfreq, + &priv->gpu_devfreq_config.downdifferential); +if (priv->kms && priv->kms->funcs->debugfs_init) priv->kms->funcs->debugfs_init (priv->kms, minor);
drivers/gpu/drm/msm/msm_drv.h +9 -0
@@ -11,6 +11,7 @@#include <linux/kernel.h> #include <linux/clk.h> #include <linux/cpufreq.h> +#include <linux/devfreq.h> #include <linux/module.h> #include <linux/component.h> #include <linux/platform_device.h>
@@ -234,6 +235,14 @@ struct msm_drm_private {*/ unsigned int hangcheck_period; +/** gpu_devfreq_config: Devfreq tuning config for the GPU. */ +struct devfreq_simple_ondemand_data gpu_devfreq_config; + +/** +* gpu_clamp_to_idle: Enable clamping to idle freq when inactive +*/ +bool gpu_clamp_to_idle; +/** * disable_err_irq: *
drivers/gpu/drm/msm/msm_gpu.h +0 -3
@@ -275,9 +275,6 @@ struct msm_gpu {struct msm_gpu_state *crashstate; -/* Enable clamping to idle freq when inactive: */ -bool clamp_to_idle; -/* True if the hardware supports expanded apriv (a650 and newer) */ bool hw_apriv;
drivers/gpu/drm/msm/msm_gpu_devfreq.c +4 -2
@@ -183,6 +183,7 @@ static bool has_devfreq(struct msm_gpu *gpu)void msm_devfreq_init (struct msm_gpu *gpu) {struct msm_gpu_devfreq *df = &gpu->devfreq; +struct msm_drm_private *priv = gpu->dev->dev_private;/* We need target support to do devfreq */ if (!gpu->funcs->gpu_busy)
@@ -209,7 +210,7 @@ void msm_devfreq_init(struct msm_gpu *gpu) df->devfreq =devm_devfreq_add_device (&gpu->pdev->dev, &msm_devfreq_profile,DEVFREQ_GOV_SIMPLE_ONDEMAND , -NULL ); + &priv->gpu_devfreq_config);if (IS_ERR (df->devfreq)) {DRM_DEV_ERROR (&gpu->pdev->dev,"Couldn't initialize GPU devfreq\n" );
@@ -358,10 +359,11 @@ static void msm_devfreq_idle_work(struct kthread_work *work)struct msm_gpu_devfreq *df =container_of (work, struct msm_gpu_devfreq, idle_work.work); struct msm_gpu *gpu = container_of(df, struct msm_gpu, devfreq); +struct msm_drm_private *priv = gpu->dev->dev_private; df->idle_time =ktime_get (); -if (gpu->clamp_to_idle) +if (priv->gpu_clamp_to_idle)dev_pm_qos_update_request (&df->idle_freq,0 ); }
Signature · 1 line
2.38.1
PATCH 2/3 drm/msm/gpu: Bypass PM QoS constraint for idle clamp
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Change idle freq clamping back to the direct method, bypassing PM QoS requests. The problem with using PM QoS requests is they call (indirectly) the governors ->get_target_freq() which goes thru a get_dev_status() cycle. The problem comes when the GPU becomes active again and we remove the idle-clamp request, we go through another get_dev_status() cycle for the period that the GPU has been idle, which triggers the governor to lower the target freq excessively.
This partially reverts commit 7c0ffcd40b16 ("drm/msm/gpu: Respect PM QoS constraints"), but preserves the use of boost QoS request, so that it will continue to play nicely with other QoS requests such as a cooling device. This also mostly undoes commit 78f815c1cf8f ("drm/msm: return the average load over the polling period")
--- drivers/gpu/drm/msm/msm_gpu.h | 12 ++- drivers/gpu/drm/msm/msm_gpu_devfreq.c | 135 +++++++++++--------------- 2 files changed, 65 insertions(+), 82 deletions(-)
drivers/gpu/drm/msm/msm_gpu.h +7 -5
@@ -109,11 +109,15 @@ struct msm_gpu_devfreq {struct mutex lock;/** -* idle_constraint: +* idle_freq: * -* A PM QoS constraint to limit max freq while the GPU is idle. +* Shadow frequency used while the GPU is idle. From the PoV of +* the devfreq governor, we are continuing to sample busyness and +* adjust frequency while the GPU is idle, but we use this shadow +* value as the GPU is actually clamped to minimum frequency while +* it is inactive. */ -struct dev_pm_qos_request idle_freq; +unsigned long idle_freq;/** * boost_constraint:
@@ -135,8 +139,6 @@ struct msm_gpu_devfreq {/** idle_time: Time of last transition to idle: */ ktime_t idle_time; -struct devfreq_dev_status average_status; -/** * idle_work: *
drivers/gpu/drm/msm/msm_gpu_devfreq.c +58 -77
214 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH 3/3 drm/msm/gpu: Add default devfreq thresholds
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
--- drivers/gpu/drm/msm/msm_gpu_devfreq.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/msm/msm_gpu_devfreq.c +9 -0
@@ -145,6 +145,15 @@ void msm_devfreq_init(struct msm_gpu *gpu)if (!gpu->funcs->gpu_busy)return ; +/* +* Setup default values for simple_ondemand governor tuning. We +* want to throttle up at 50% load for the double-buffer case, +* where due to stalling waiting for vblank we could get stuck +* at (for ex) 30fps at 50% utilization. +*/ + priv->gpu_devfreq_config.upthreshold =50 ; + priv->gpu_devfreq_config.downdifferential =10 ; +mutex_init (&df->lock); dev_pm_qos_add_request(&gpu->pdev->dev, &df->boost_freq,
Signature · 1 line
2.38.1