On 12.02.2023 00:12, Dmitry Baryshkov wrote:
> To ease review and reuse rename MERGE_3D feature masks to contain base
> DPU version since which this mask is used.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dyb...@linaro.org>
Konrad
> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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 b8143a3c35b0..6f907992866b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -70,7 +70,7 @@
> #define CTL_DPU_9_MASK \
> (CTL_DPU_7_MASK | BIT(DPU_CTL_HAS_LAYER_EXT4))
>
> -#define MERGE_3D_SM8150_MASK (0)
> +#define MERGE_3D_DPU_5_MASK (0)
>
> #define DSPP_MSM8998_MASK BIT(DPU_DSPP_PCC) | BIT(DPU_DSPP_GC)
>
> @@ -507,7 +507,7 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk
> = {
> {\
> .name = _name, .id = _id, \
> .base = _base, .len = 0x100, \
> - .features = MERGE_3D_SM8150_MASK, \
> + .features = MERGE_3D_DPU_5_MASK, \
> .sblk = NULL \
> }
>
>
