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

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / disp / dpu1 / dpu_hw_dspp.c

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
index 8196ae4..8ab5ace 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c
@@ -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];
                }