niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/msm/dpu: drop separate dpu_core_perf_tune overrides

Browse source 
The values in struct dpu_core_perf_tune are fixed per the core perf
mode. Drop the 'tune' values and substitute them with known values when
performing perf management.

Note: min_bus_vote was not used at all, so it is just silently dropped.

Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/550208/
Link: https://lore.kernel.org/r/20230730010102.350713-4-dmitry.baryshkov@linaro.org
This commit is contained in:
Dmitry Baryshkov 2023-07-30 04:00:55 +03:00
parent 808c92df65
commit 6a4bc73915
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c
View file

@ -286,10 +286,16 @@ void dpu_core_perf_crtc_release_bw(struct drm_crtc *crtc)
static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms) static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms)
{ {
u64 clk_rate = kms->perf.perf_tune.min_core_clk; u64 clk_rate;
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct dpu_crtc_state *dpu_cstate; struct dpu_crtc_state *dpu_cstate;
if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED)
return kms->perf.fix_core_clk_rate;
if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM)
return kms->perf.max_core_clk_rate;
drm_for_each_crtc(crtc, kms->dev) { drm_for_each_crtc(crtc, kms->dev) {
if (crtc->enabled) { if (crtc->enabled) {
dpu_cstate = to_dpu_crtc_state(crtc->state); dpu_cstate = to_dpu_crtc_state(crtc->state);
@ -300,11 +306,6 @@ static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms)
} }
} }
if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED)
clk_rate = kms->perf.fix_core_clk_rate;
DRM_DEBUG_ATOMIC("clk:%llu\n", clk_rate);
return clk_rate; return clk_rate;
} }
@ -392,6 +393,8 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc,
if (update_clk) { if (update_clk) {
clk_rate = _dpu_core_perf_get_core_clk_rate(kms); clk_rate = _dpu_core_perf_get_core_clk_rate(kms);
DRM_DEBUG_ATOMIC("clk:%llu\n", clk_rate);
trace_dpu_core_perf_update_clk(kms->dev, stop_req, clk_rate); trace_dpu_core_perf_update_clk(kms->dev, stop_req, clk_rate);
clk_rate = min(clk_rate, kms->perf.max_core_clk_rate); clk_rate = min(clk_rate, kms->perf.max_core_clk_rate);
@ -413,7 +416,6 @@ static ssize_t _dpu_core_perf_mode_write(struct file *file,
const char __user *user_buf, size_t count, loff_t *ppos) const char __user *user_buf, size_t count, loff_t *ppos)
{ {
struct dpu_core_perf *perf = file->private_data; struct dpu_core_perf *perf = file->private_data;
const struct dpu_perf_cfg *cfg = perf->catalog->perf;
u32 perf_mode = 0; u32 perf_mode = 0;
int ret; int ret;
@ -428,14 +430,9 @@ static ssize_t _dpu_core_perf_mode_write(struct file *file,
DRM_INFO("fix performance mode\n"); DRM_INFO("fix performance mode\n");
} else if (perf_mode == DPU_PERF_MODE_MINIMUM) { } else if (perf_mode == DPU_PERF_MODE_MINIMUM) {
/* run the driver with max clk and BW vote */ /* run the driver with max clk and BW vote */
perf->perf_tune.min_core_clk = perf->max_core_clk_rate;
perf->perf_tune.min_bus_vote =
(u64) cfg->max_bw_high * 1000;
DRM_INFO("minimum performance mode\n"); DRM_INFO("minimum performance mode\n");
} else if (perf_mode == DPU_PERF_MODE_NORMAL) { } else if (perf_mode == DPU_PERF_MODE_NORMAL) {
/* reset the perf tune params to 0 */ /* reset the perf tune params to 0 */
perf->perf_tune.min_core_clk = 0;
perf->perf_tune.min_bus_vote = 0;
DRM_INFO("normal performance mode\n"); DRM_INFO("normal performance mode\n");
} }
perf->perf_tune.mode = perf_mode; perf->perf_tune.mode = perf_mode;
@ -451,10 +448,8 @@ static ssize_t _dpu_core_perf_mode_read(struct file *file,
char buf[128]; char buf[128];
len = scnprintf(buf, sizeof(buf), len = scnprintf(buf, sizeof(buf),
"mode %d min_mdp_clk %llu min_bus_vote %llu\n", "mode %d\n",
perf->perf_tune.mode, perf->perf_tune.mode);
perf->perf_tune.min_core_clk,
perf->perf_tune.min_bus_vote);
return simple_read_from_buffer(buff, count, ppos, buf, len); return simple_read_from_buffer(buff, count, ppos, buf, len);
} }

4
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h
View file

@ -29,13 +29,9 @@ struct dpu_core_perf_params {
/** /**
* struct dpu_core_perf_tune - definition of performance tuning control * struct dpu_core_perf_tune - definition of performance tuning control
* @mode: performance mode * @mode: performance mode
* @min_core_clk: minimum core clock
* @min_bus_vote: minimum bus vote
*/ */
struct dpu_core_perf_tune { struct dpu_core_perf_tune {
u32 mode; u32 mode;
u64 min_core_clk;
u64 min_bus_vote;
}; };
/** /**