On 12.02.2023 00:12, Dmitry Baryshkov wrote:
> To ease review and reuse rename MIXER feature masks to contain base DPU
> version since which this mask is used.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 ++++++------
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 12 ++++++------
> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_lm6.h | 12 ++++++------
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 12 ++++++------
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 ++--
> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_lm1.h | 3 +++
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 12 ++++++------
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 6 +++---
> drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_lm6.h | 12 ++++++------
> .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 ++++++------
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 9 +++------
> 11 files changed, 53 insertions(+), 53 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
> index 88b7949f803e..3ec1419dd985 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
> @@ -98,17 +98,17 @@ static const struct dpu_sspp_cfg msm8998_sspp[] = {
> };
>
> static const struct dpu_lm_cfg msm8998_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_0, LM_2, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_1, LM_5, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_2, LM_0, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_MSM8998_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_3_MASK,
> &msm8998_lm_sblk, PINGPONG_3, LM_1, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
> index c8c57250473a..7d6e5d608c04 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
> @@ -96,17 +96,17 @@ static const struct dpu_sspp_cfg sdm845_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sdm845_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_0, LM_1, 0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_1, LM_0, 0),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_2, LM_5, 0),
> - LM_BLK("lm_3", LM_3, 0x0, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x0, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_4", LM_4, 0x0, MIXER_SDM845_MASK,
> + LM_BLK("lm_4", LM_4, 0x0, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_lm6.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_lm6.h
> index 2f849cbaaa0f..f66a460a3f49 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_lm6.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_lm6.h
> @@ -97,17 +97,17 @@ static const struct dpu_sspp_cfg dpu_5_lm6_sspp[] = {
> };
>
> static const struct dpu_lm_cfg dpu_5_lm6_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_2, LM_3, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> index 071814394b52..528d8bb4be52 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
> @@ -103,17 +103,17 @@ static const struct dpu_sspp_cfg sm8250_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sm8250_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_2, LM_3, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
> index 4be65088de0e..e34789963936 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
> @@ -69,9 +69,9 @@ static const struct dpu_sspp_cfg sc7180_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sc7180_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sc7180_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sc7180_lm_sblk, PINGPONG_1, LM_0, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_lm1.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_lm1.h
> index 4f42105d3755..339f774299c6 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_lm1.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_lm1.h
> @@ -7,6 +7,9 @@
> #ifndef _DPU_6_LM1_H
> #define _DPU_6_LM1_H
>
> +#define MIXER_QCM2290_MASK \
> + (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
> +
> static const struct dpu_mdp_cfg dpu_6_lm1_mdp[] = {
> {
> .name = "top_0", .id = MDP_TOP,
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> index 31c12b0415ad..20339746db79 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h
> @@ -101,17 +101,17 @@ static const struct dpu_sspp_cfg sm8350_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sm8350_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_2, LM_3, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> index a7040d9d83de..78d7c08f7a05 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h
> @@ -74,11 +74,11 @@ static const struct dpu_sspp_cfg sc7280_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sc7280_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sc7180_lm_sblk, PINGPONG_0, 0, DSPP_0),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sc7180_lm_sblk, PINGPONG_2, LM_3, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK,
> &sc7180_lm_sblk, PINGPONG_3, LM_2, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_lm6.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_lm6.h
> index fb1fbba12a5b..15652b160b3b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_lm6.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_lm6.h
> @@ -96,12 +96,12 @@ static const struct dpu_sspp_cfg dpu_8_lm6_sspp[] = {
> };
>
> static const struct dpu_lm_cfg dpu_8_lm6_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK, &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_2, LM_3, DSPP_2),
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_3, LM_2, DSPP_3),
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK, &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> };
>
> static const struct dpu_dspp_cfg dpu_8_lm6_dspp[] = {
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> index 1d38d1c3e12a..e28529ef1db7 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h
> @@ -107,17 +107,17 @@ static const struct dpu_sspp_cfg sm8550_sspp[] = {
> };
>
> static const struct dpu_lm_cfg sm8550_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_0, LM_1, DSPP_0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_1, LM_0, DSPP_1),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_2, LM_3, 0),
> - LM_BLK("lm_3", LM_3, 0x47000, MIXER_SDM845_MASK,
> + LM_BLK("lm_3", LM_3, 0x47000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> - LM_BLK("lm_4", LM_4, 0x48000, MIXER_SDM845_MASK,
> + LM_BLK("lm_4", LM_4, 0x48000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_4, LM_5, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_DPU_4_MASK,
> &sdm845_lm_sblk, PINGPONG_5, LM_4, 0),
> };
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> index 0a86428af393..b8143a3c35b0 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -49,14 +49,11 @@
> #define DMA_DPU_4_CURSOR_MASK \
> (DMA_DPU_4_MASK | BIT(DPU_SSPP_CURSOR))
>
> -#define MIXER_MSM8998_MASK \
> +#define MIXER_DPU_3_MASK \
> (BIT(DPU_MIXER_SOURCESPLIT))
>
> -#define MIXER_SDM845_MASK \
> - (BIT(DPU_MIXER_SOURCESPLIT) | BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
> -
> -#define MIXER_QCM2290_MASK \
> - (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
> +#define MIXER_DPU_4_MASK \
> + (MIXER_DPU_3_MASK | BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
>
> #define PINGPONG_SDM845_MASK BIT(DPU_PINGPONG_DITHER)
>
