diff options
| author | Alan Kwong <akwong@codeaurora.org> | 2016-09-29 09:43:33 -0400 |
|---|---|---|
| committer | Alan Kwong <akwong@codeaurora.org> | 2016-10-06 20:09:37 -0400 |
| commit | a1008a7187de2fcadb393cdcfd83b0bbb36483b3 (patch) | |
| tree | ce09d89f7045c8133cbb86d73d1e9a5921fbf126 | |
| parent | 0cdce2744f8d171a491f4b54df8461b2f336e1c8 (diff) | |
drm/msm/sde: remove unused traffic shaper from hw drivers
Traffic shaper is not used by writeback; hence remove traffic
shaper from writeback and top hardware drivers.
Change-Id: I006f72877a5a546fb67e80d1344da95d82711fa8
Signed-off-by: Alan Kwong <akwong@codeaurora.org>
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_top.c | 25 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_wb.c | 11 |
2 files changed, 0 insertions, 36 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_top.c b/drivers/gpu/drm/msm/sde/sde_hw_top.c index 8feca9b56b81..9e9fb042ad6a 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_top.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_top.c @@ -84,30 +84,6 @@ static void sde_hw_setup_cdm_output(struct sde_hw_mdp *mdp, SDE_REG_WRITE(c, MDP_OUT_CTL_0, out_ctl); } -static void sde_hw_setup_traffic_shaper(struct sde_hw_mdp *mdp, - struct traffic_shaper_cfg *cfg) -{ - struct sde_hw_blk_reg_map *c = &mdp->hw; - u32 ts_control = 0; - u32 offset; - u64 bpc; - - if (cfg->rd_client) - offset = TRAFFIC_SHAPER_RD_CLIENT(cfg->client_id); - else - offset = TRAFFIC_SHAPER_WR_CLIENT(cfg->client_id); - - if (cfg->en) { - bpc = cfg->bpc_numer; - do_div(bpc, (cfg->bpc_denom >> - TRAFFIC_SHAPER_FIXPOINT_FACTOR)); - ts_control = lower_32_bits(bpc) + 1; - ts_control |= TRAFFIC_SHAPER_EN; - } - - SDE_REG_WRITE(c, offset, ts_control); -} - static bool sde_hw_setup_clk_force_ctrl(struct sde_hw_mdp *mdp, enum sde_clk_ctrl_type clk_ctrl, bool enable) { @@ -141,7 +117,6 @@ static void _setup_mdp_ops(struct sde_hw_mdp_ops *ops, { ops->setup_split_pipe = sde_hw_setup_split_pipe_control; ops->setup_cdm_output = sde_hw_setup_cdm_output; - ops->setup_traffic_shaper = sde_hw_setup_traffic_shaper; ops->setup_clk_force_ctrl = sde_hw_setup_clk_force_ctrl; } diff --git a/drivers/gpu/drm/msm/sde/sde_hw_wb.c b/drivers/gpu/drm/msm/sde/sde_hw_wb.c index 3c7f2fe843aa..c68ee23337bb 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_wb.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_wb.c @@ -162,14 +162,6 @@ static void sde_hw_wb_setup_format(struct sde_hw_wb *ctx, SDE_REG_WRITE(c, WB_CDP_CTRL, cdp_settings); } -static void sde_hw_wb_traffic_shaper(struct sde_hw_wb *ctx, - struct sde_hw_wb_cfg *data) -{ - if (ctx->hw_mdp && ctx->hw_mdp->ops.setup_traffic_shaper) - ctx->hw_mdp->ops.setup_traffic_shaper(ctx->hw_mdp, - &data->ts_cfg); -} - static void sde_hw_wb_roi(struct sde_hw_wb *ctx, struct sde_hw_wb_cfg *wb) { struct sde_hw_blk_reg_map *c = &ctx->hw; @@ -190,9 +182,6 @@ static void _setup_wb_ops(struct sde_hw_wb_ops *ops, ops->setup_outaddress = sde_hw_wb_setup_outaddress; ops->setup_outformat = sde_hw_wb_setup_format; - if (test_bit(SDE_WB_TRAFFIC_SHAPER, &features)) - ops->setup_trafficshaper = sde_hw_wb_traffic_shaper; - if (test_bit(SDE_WB_XY_ROI_OFFSET, &features)) ops->setup_roi = sde_hw_wb_roi; } |