Commit 9403f9a4 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm/dpu: merge base_off with blk_off in struct dpu_hw_blk_reg_map 



There is little point in keeping a separate MDP address and block offset
in this struct. Merge them to form a new blk_addr field used for all
register access.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/488017/
Link: https://lore.kernel.org/r/20220601161349.1517667-4-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 1e5df24b

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl, 


	for (i = 0; i < m->ctl_count; i++) {

		if (ctl == m->ctl[i].id) {

			b->base_off = addr;

			b->blk_off = m->ctl[i].base;

			b->blk_addr = addr + m->ctl[i].base;

			b->log_mask = DPU_DBG_MASK_CTL;

			return &m->ctl[i];

		}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc, 


	for (i = 0; i < m->dsc_count; i++) {

		if (dsc == m->dsc[i].id) {

			b->base_off = addr;

			b->blk_off = m->dsc[i].base;

			b->blk_addr = addr + m->dsc[i].base;

			b->log_mask = DPU_DBG_MASK_DSC;

			return &m->dsc[i];

		}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp, 


	for (i = 0; i < m->dspp_count; i++) {

		if (dspp == m->dspp[i].id) {

			b->base_off = addr;

			b->blk_off = m->dspp[i].base;

			b->blk_addr = addr + m->dspp[i].base;

			b->log_mask = DPU_DBG_MASK_DSPP;

			return &m->dspp[i];

		}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c

+1 −2
Original line number Diff line number Diff line
@@ -401,8 +401,7 @@ u32 dpu_core_irq_read(struct dpu_kms *dpu_kms, int irq_idx) 
static void __intr_offset(const struct dpu_mdss_cfg *m,

		void __iomem *addr, struct dpu_hw_blk_reg_map *hw)

{

	hw->base_off = addr;

	hw->blk_off = m->mdp[0].base;

	hw->blk_addr = addr + m->mdp[0].base;

}



struct dpu_hw_intr *dpu_hw_intr_init(void __iomem *addr,

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ static const struct dpu_intf_cfg *_intf_offset(enum dpu_intf intf, 
	for (i = 0; i < m->intf_count; i++) {

		if ((intf == m->intf[i].id) &&

		(m->intf[i].type != INTF_NONE)) {

			b->base_off = addr;

			b->blk_off = m->intf[i].base;

			b->blk_addr = addr + m->intf[i].base;

			b->log_mask = DPU_DBG_MASK_INTF;

			return &m->intf[i];

		}