On Mon, Oct 08, 2018 at 09:27:23PM -0700, Jeykumar Sankaran wrote:
> struct dpu_hw_blk has hw block type info. Remove duplicate
> type tracking in struct dpu_rm_hw_blk.
>
> Signed-off-by: Jeykumar Sankaran <jsanka@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 17 ++++-------------
> 1 file changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> index 5ce89b9..377def7 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> @@ -38,14 +38,12 @@ struct dpu_rm_requirements {
> /**
> * struct dpu_rm_hw_blk - hardware block tracking list member
> * @list: List head for list of all hardware blocks tracking items
> - * @type: Type of hardware block this structure tracks
> * @id: Hardware ID number, within it's own space, ie. LM_X
> * @enc_id: Encoder id to which this blk is binded
> * @hw: Pointer to the hardware register access object for this block
> */
> struct dpu_rm_hw_blk {
> struct list_head list;
> - enum dpu_hw_blk_type type;
> uint32_t id;
> uint32_t enc_id;
> struct dpu_hw_blk *hw;
> @@ -86,12 +84,6 @@ static bool _dpu_rm_get_hw_locked(struct dpu_rm *rm, struct dpu_rm_hw_iter *i)
> i->blk = list_prepare_entry(i->blk, blk_list, list);
>
> list_for_each_entry_continue(i->blk, blk_list, list) {
> - if (i->blk->type != i->type) {
> - DPU_ERROR("found incorrect block type %d on %d list\n",
> - i->blk->type, i->type);
> - return false;
> - }
> -
> if (i->enc_id == i->blk->enc_id) {
> i->hw = i->blk->hw;
> DPU_DEBUG("found type %d id %d for enc %d\n",
> @@ -151,7 +143,7 @@ int dpu_rm_destroy(struct dpu_rm *rm)
> list_for_each_entry_safe(hw_cur, hw_nxt, &rm->hw_blks[type],
> list) {
> list_del(&hw_cur->list);
> - _dpu_rm_hw_destroy(hw_cur->type, hw_cur->hw);
> + _dpu_rm_hw_destroy(type, hw_cur->hw);
> kfree(hw_cur);
> }
> }
> @@ -213,7 +205,6 @@ static int _dpu_rm_hw_blk_create(
> return -ENOMEM;
> }
>
> - blk->type = type;
> blk->id = id;
> blk->hw = hw;
> blk->enc_id = 0;
> @@ -458,7 +449,7 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, uint32_t enc_id,
> lm[i]->enc_id = enc_id;
> pp[i]->enc_id = enc_id;
>
> - trace_dpu_rm_reserve_lms(lm[i]->id, lm[i]->type, enc_id,
> + trace_dpu_rm_reserve_lms(lm[i]->id, DPU_HW_BLK_LM, enc_id,
> pp[i]->id);
> }
>
> @@ -510,7 +501,7 @@ static int _dpu_rm_reserve_ctls(
>
> for (i = 0; i < ARRAY_SIZE(ctls) && i < num_ctls; i++) {
> ctls[i]->enc_id = enc_id;
> - trace_dpu_rm_reserve_ctls(ctls[i]->id, ctls[i]->type,
> + trace_dpu_rm_reserve_ctls(ctls[i]->id, DPU_HW_BLK_CTL,
> enc_id);
> }
>
> @@ -538,7 +529,7 @@ static int _dpu_rm_reserve_intf(
> }
>
> iter.blk->enc_id = enc_id;
> - trace_dpu_rm_reserve_intf(iter.blk->id, iter.blk->type,
> + trace_dpu_rm_reserve_intf(iter.blk->id, DPU_HW_BLK_INTF,
You should probably just remove the argument from the trace statements since
it's redundant.
Sean
> enc_id);
> break;
> }
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
--
Sean Paul, Software Engineer, Google / Chromium OS
