summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp.c7
-rw-r--r--drivers/video/fbdev/msm/mdss_smmu.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c
index 565483cdeb32..571a3d62960e 100644
--- a/drivers/video/fbdev/msm/mdss_mdp.c
+++ b/drivers/video/fbdev/msm/mdss_mdp.c
@@ -304,6 +304,7 @@ static int mdss_mdp_bus_scale_set_quota(u64 ab_quota_rt, u64 ab_quota_nrt,
int new_uc_idx;
u64 ab_quota[MAX_AXI_PORT_COUNT] = {0, 0};
u64 ib_quota[MAX_AXI_PORT_COUNT] = {0, 0};
+ int rc;
if (mdss_res->bus_hdl < 1) {
pr_err("invalid bus handle %d\n", mdss_res->bus_hdl);
@@ -390,8 +391,12 @@ static int mdss_mdp_bus_scale_set_quota(u64 ab_quota_rt, u64 ab_quota_nrt,
}
mdss_res->curr_bw_uc_idx = new_uc_idx;
- return msm_bus_scale_client_update_request(mdss_res->bus_hdl,
+ ATRACE_BEGIN("msm_bus_scale_req");
+ rc = msm_bus_scale_client_update_request(mdss_res->bus_hdl,
new_uc_idx);
+ ATRACE_END("msm_bus_scale_req");
+
+ return rc;
}
int mdss_enable_bus_vote(int usecase_ndx)
diff --git a/drivers/video/fbdev/msm/mdss_smmu.c b/drivers/video/fbdev/msm/mdss_smmu.c
index 0b59e70e8ef1..035b8eb6e080 100644
--- a/drivers/video/fbdev/msm/mdss_smmu.c
+++ b/drivers/video/fbdev/msm/mdss_smmu.c
@@ -258,12 +258,13 @@ static int mdss_smmu_map_dma_buf_v2(struct dma_buf *dma_buf,
pr_err("not able to get smmu context\n");
return -EINVAL;
}
-
+ ATRACE_BEGIN("map_buffer");
rc = dma_map_sg(mdss_smmu->dev, table->sgl, table->nents, dir);
if (!rc) {
pr_err("dma map sg failed\n");
return -ENOMEM;
}
+ ATRACE_END("map_buffer");
*iova = table->sgl->dma_address;
*size = table->sgl->dma_length;
return 0;
@@ -278,7 +279,9 @@ static void mdss_smmu_unmap_dma_buf_v2(struct sg_table *table, int domain,
return;
}
+ ATRACE_BEGIN("unmap_buffer");
dma_unmap_sg(mdss_smmu->dev, table->sgl, table->nents, dir);
+ ATRACE_END("unmap_buffer");
}
/*