diff options
| author | Ping Li <quicpingli@codeaurora.org> | 2013-08-19 14:12:26 -0400 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:20:09 -0700 |
| commit | 36171564d2084f97f88d515c1953fbbca6645e8d (patch) | |
| tree | ccdd23ff5e7af6942805c6dcfc281cc48487045a /drivers/video/fbdev | |
| parent | 4a13122516e0823062df2ebc7ea37f6176dbe49e (diff) | |
Revert "msm: mdss: Increase the cnoc clock rate"
This patch will increase the cnoc clock rate whenever MDP is on, which
is not necessary. The desired implementation is to increase the cnoc
clock rate when hist LUT are updated.
This reverts commit 61223f37af38d14f56ee67f823cb3eda52a81f93.
Change-Id: I8394bf33175b050567f6c3ada586cb4f1d3c4d7e
Signed-off-by: Ping Li <quicpingli@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 37 |
1 files changed, 12 insertions, 25 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index f983aa6a8fed..373af4654f42 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -79,32 +79,20 @@ static DEFINE_SPINLOCK(mdp_lock); static DEFINE_MUTEX(mdp_clk_lock); static DEFINE_MUTEX(bus_bw_lock); -#define MDP_BUS_VECTOR_ENTRY(src_val, dst_val, ab_val, ib_val) \ - { \ - .src = (src_val), \ - .dst = (dst_val), \ - .ab = (ab_val), \ - .ib = (ib_val), \ +#define MDP_BUS_VECTOR_ENTRY(ab_val, ib_val) \ + { \ + .src = MSM_BUS_MASTER_MDP_PORT0, \ + .dst = MSM_BUS_SLAVE_EBI_CH0, \ + .ab = (ab_val), \ + .ib = (ib_val), \ } -#define MDP_BUS_USECASE_CNT 3 -#define MDP_BUS_NUM_PATH_CNT 2 -#define SZ_37_5M (37500000 * 8) static struct msm_bus_vectors mdp_bus_vectors[] = { - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_MDP_PORT0, MSM_BUS_SLAVE_EBI_CH0, - 0, 0), - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_SPDM, MSM_BUS_SLAVE_IMEM_CFG, - 0, 0), - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_MDP_PORT0, MSM_BUS_SLAVE_EBI_CH0, - SZ_128M, SZ_256M), - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_SPDM, MSM_BUS_SLAVE_IMEM_CFG, - 0, SZ_37_5M), - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_MDP_PORT0, MSM_BUS_SLAVE_EBI_CH0, - SZ_256M, SZ_512M), - MDP_BUS_VECTOR_ENTRY(MSM_BUS_MASTER_SPDM, MSM_BUS_SLAVE_IMEM_CFG, - 0, SZ_37_5M), + MDP_BUS_VECTOR_ENTRY(0, 0), + MDP_BUS_VECTOR_ENTRY(SZ_128M, SZ_256M), + MDP_BUS_VECTOR_ENTRY(SZ_256M, SZ_512M), }; -static struct msm_bus_paths mdp_bus_usecases[MDP_BUS_USECASE_CNT]; +static struct msm_bus_paths mdp_bus_usecases[ARRAY_SIZE(mdp_bus_vectors)]; static struct msm_bus_scale_pdata mdp_bus_scale_table = { .usecase = mdp_bus_usecases, .num_usecases = ARRAY_SIZE(mdp_bus_usecases), @@ -338,9 +326,8 @@ static int mdss_mdp_bus_scale_register(struct mdss_data_type *mdata) int i; for (i = 0; i < bus_pdata->num_usecases; i++) { - mdp_bus_usecases[i].num_paths = MDP_BUS_NUM_PATH_CNT; - mdp_bus_usecases[i].vectors = - &mdp_bus_vectors[i * MDP_BUS_NUM_PATH_CNT]; + mdp_bus_usecases[i].num_paths = 1; + mdp_bus_usecases[i].vectors = &mdp_bus_vectors[i]; } mdata->bus_hdl = msm_bus_scale_register_client(bus_pdata); |