[PATCH v2 11/33] drm/msm/dpu: get rid of DPU_CTL_DSPP_SUB_BLOCK_FLUSH

[Dmitry Baryshkov]

From: Dmitry Baryshkov <lu...@kernel.org>

Continue migration to the MDSS-revision based checks and replace
DPU_CTL_DSPP_SUB_BLOCK_FLUSH feature bit with the core_major_ver >= 7
check.

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhin...@quicinc.com>
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +--
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 --
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c     | 2 +-
 3 files changed, 2 insertions(+), 5 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 
3431b3c956486aee99664ea9b7c2e00f5c130b7f..a2dc353151f3e1a4cb8a9f4644e7fc2e037356a2
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -111,8 +111,7 @@
        (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC))
 
 #define CTL_SC7280_MASK \
-       (BIT(DPU_CTL_VM_CFG) | \
-        BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH))
+       (BIT(DPU_CTL_VM_CFG))
 
 #define INTF_SC7180_MASK \
        (BIT(DPU_INTF_INPUT_CTRL) | \
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index 
ae168e73026d8ebbe605397c6bbd95552193498c..1c6be8f93b54f28d370a379d1edccd178fe3cf7b
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -135,13 +135,11 @@ enum {
  * CTL sub-blocks
  * @DPU_CTL_SPLIT_DISPLAY:     CTL supports video mode split display
  * @DPU_CTL_VM_CFG:            CTL config to support multiple VMs
- * @DPU_CTL_DSPP_BLOCK_FLUSH:  CTL config to support dspp sub-block flush
  * @DPU_CTL_MAX
  */
 enum {
        DPU_CTL_SPLIT_DISPLAY = 0x1,
        DPU_CTL_VM_CFG,
-       DPU_CTL_DSPP_SUB_BLOCK_FLUSH,
        DPU_CTL_MAX
 };
 
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
index 
593da532d40042ca31fb452679d3de04c3b0d1a7..543fe12252b7887ce2bd28abafac3be7caf17ac4
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
@@ -781,7 +781,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev,
        c->ops.setup_blendstage = dpu_hw_ctl_setup_blendstage;
        c->ops.update_pending_flush_sspp = dpu_hw_ctl_update_pending_flush_sspp;
        c->ops.update_pending_flush_mixer = 
dpu_hw_ctl_update_pending_flush_mixer;
-       if (c->caps->features & BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH))
+       if (mdss_ver->core_major_ver >= 7)
                c->ops.update_pending_flush_dspp = 
dpu_hw_ctl_update_pending_flush_dspp_sub_blocks;
        else
                c->ops.update_pending_flush_dspp = 
dpu_hw_ctl_update_pending_flush_dspp;

-- 
2.39.5