Skip to content

Commit c54b611

Browse files
committed
drm/msm/dpu: change ib values to u32
The IB values in core_perf calculations (max_per_pipe_ib, fix_core_ib_vote) are expressed in KBps and are passed to icc_set_bw without additional division. Change type of those values to u32. Reviewed-by: Abhinav Kumar <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/636061/ Link: https://lore.kernel.org/r/[email protected]
1 parent 795aef6 commit c54b611

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf,
135135
}
136136

137137
DRM_DEBUG_ATOMIC(
138-
"crtc=%d clk_rate=%llu core_ib=%llu core_ab=%llu\n",
138+
"crtc=%d clk_rate=%llu core_ib=%u core_ab=%llu\n",
139139
crtc->base.id, perf->core_clk_rate,
140140
perf->max_per_pipe_ib, perf->bw_ctl);
141141
}
@@ -477,7 +477,7 @@ int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent)
477477
(u32 *)perf, &dpu_core_perf_mode_fops);
478478
debugfs_create_u64("fix_core_clk_rate", 0600, entry,
479479
&perf->fix_core_clk_rate);
480-
debugfs_create_u64("fix_core_ib_vote", 0600, entry,
480+
debugfs_create_u32("fix_core_ib_vote", 0600, entry,
481481
&perf->fix_core_ib_vote);
482482
debugfs_create_u64("fix_core_ab_vote", 0600, entry,
483483
&perf->fix_core_ab_vote);

drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @core_clk_rate: core clock rate request
2020
*/
2121
struct dpu_core_perf_params {
22-
u64 max_per_pipe_ib;
22+
u32 max_per_pipe_ib;
2323
u64 bw_ctl;
2424
u64 core_clk_rate;
2525
};
@@ -40,7 +40,7 @@ struct dpu_core_perf_tune {
4040
* @perf_tune: debug control for performance tuning
4141
* @enable_bw_release: debug control for bandwidth release
4242
* @fix_core_clk_rate: fixed core clock request in Hz used in mode 2
43-
* @fix_core_ib_vote: fixed core ib vote in bps used in mode 2
43+
* @fix_core_ib_vote: fixed core ib vote in KBps used in mode 2
4444
* @fix_core_ab_vote: fixed core ab vote in bps used in mode 2
4545
*/
4646
struct dpu_core_perf {
@@ -50,7 +50,7 @@ struct dpu_core_perf {
5050
struct dpu_core_perf_tune perf_tune;
5151
u32 enable_bw_release;
5252
u64 fix_core_clk_rate;
53-
u64 fix_core_ib_vote;
53+
u32 fix_core_ib_vote;
5454
u64 fix_core_ab_vote;
5555
};
5656

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1680,7 +1680,7 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
16801680
seq_printf(s, "core_clk_rate: %llu\n",
16811681
dpu_crtc->cur_perf.core_clk_rate);
16821682
seq_printf(s, "bw_ctl: %llu\n", dpu_crtc->cur_perf.bw_ctl);
1683-
seq_printf(s, "max_per_pipe_ib: %llu\n",
1683+
seq_printf(s, "max_per_pipe_ib: %u\n",
16841684
dpu_crtc->cur_perf.max_per_pipe_ib);
16851685

16861686
return 0;

0 commit comments

Comments
 (0)