shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: mpp: modify the means of default_max_load value equal 0

Browse Source 
tips: when default_max_load is 0, means not have advanced clk_mode,
use normal clk_mode instead.

Change-Id: I1933a6af29789fbb54b5163a750fc4d5f058b7ee
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2020-08-14 15:05:01 +08:00
committed by Tao Huang
parent 5ff57575c9
commit 86871bddb2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/rockchip/mpp/mpp_common.c
View File

@@ -1824,6 +1824,8 @@ unsigned long mpp_get_clk_info_rate_hz(struct mpp_clk_info *clk_info,
case CLK_MODE_ADVANCED: {
if (clk_info->advanced_rate_hz)
clk_rate_hz = clk_info->advanced_rate_hz;
else if (clk_info->normal_rate_hz)
clk_rate_hz = clk_info->normal_rate_hz;
else
clk_rate_hz = clk_info->default_rate_hz;
} break;

7
drivers/video/rockchip/mpp/mpp_rkvenc.c
View File

@@ -109,7 +109,6 @@
#define RKVENC_GET_WIDTH(x) (((x & 0x1ff) + 1) << 3)
#define RKVENC_GET_HEIGHT(x) ((((x >> 16) & 0x1ff) + 1) << 3)
#define RKVENC_DEFAULT_MAX_LOAD (1920 * 1088)
#define to_rkvenc_task(ctx) \
container_of(ctx, struct rkvenc_task, mpp_task)
@@ -900,8 +899,6 @@ static int rkvenc_init(struct mpp_dev *mpp)
of_property_read_u32(mpp->dev->of_node,
"rockchip,default-max-load",
&enc->default_max_load);
if (!enc->default_max_load)
enc->default_max_load = RKVENC_DEFAULT_MAX_LOAD;
/* Set default rates */
mpp_set_clk_info_rate_hz(&enc->aclk_info, CLK_MODE_DEFAULT, 300 * MHZ);
mpp_set_clk_info_rate_hz(&enc->core_clk_info, CLK_MODE_DEFAULT, 600 * MHZ);
@@ -1000,6 +997,10 @@ static int rkvenc_get_freq(struct mpp_dev *mpp,
struct rkvenc_dev *enc = to_rkvenc_dev(mpp);
struct rkvenc_task *task = to_rkvenc_task(mpp_task);
/* if not set max load, consider not have advanced mode */
if (!enc->default_max_load)
return 0;
task_cnt = 1;
workload = task->pixels;
/* calc workload in pending list */