Commit 129ae533 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: remove hwversion field from data structures 



The driver should not depend on hw revision for detecting features.
Instead it should use features from the hw catalog. Drop the hwversion
field from struct dpu_mdss_cfg and struct dpu_hw_blk_reg_map.

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


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent c8744315

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

+0 −1
Original line number Diff line number Diff line
@@ -2004,7 +2004,6 @@ struct dpu_mdss_cfg *dpu_hw_catalog_init(u32 hw_rev) 
	for (i = 0; i < ARRAY_SIZE(cfg_handler); i++) {

		if (cfg_handler[i].hw_rev == hw_rev) {

			cfg_handler[i].cfg_init(dpu_cfg);

			dpu_cfg->hwversion = hw_rev;

			return dpu_cfg;

		}

	}

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h

+0 −2
Original line number Diff line number Diff line
@@ -826,8 +826,6 @@ struct dpu_perf_cfg { 
 * @mdss_irqs:         Bitmap with the irqs supported by the target

 */

struct dpu_mdss_cfg {

	u32 hwversion;



	const struct dpu_caps *caps;



	u32 mdp_count;

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

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static const struct dpu_ctl_cfg *_ctl_offset(enum dpu_ctl ctl, 
			b->base_off = addr;

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

			b->length = m->ctl[i].len;

			b->hwversion = m->hwversion;

			b->log_mask = DPU_DBG_MASK_CTL;

			return &m->ctl[i];

		}

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

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static struct dpu_dsc_cfg *_dsc_offset(enum dpu_dsc dsc, 
			b->base_off = addr;

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

			b->length = m->dsc[i].len;

			b->hwversion = m->hwversion;

			b->log_mask = DPU_DBG_MASK_DSC;

			return &m->dsc[i];

		}

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

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static const struct dpu_dspp_cfg *_dspp_offset(enum dpu_dspp dspp, 
			b->base_off = addr;

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

			b->length = m->dspp[i].len;

			b->hwversion = m->hwversion;

			b->log_mask = DPU_DBG_MASK_DSPP;

			return &m->dspp[i];

		}