[PATCH 12/35] drm/msm/dpu: get rid of DPU_CTL_FETCH_ACTIVE

[Dmitry Baryshkov]

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

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 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 
0b6b4313f8acd76e8ae1a0849127466491e8f108..4b44e4d8d13631b6b1a8824b12cd8d5bd4ae7e3f
 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_FETCH_ACTIVE) | \
-        BIT(DPU_CTL_VM_CFG) | \
+       (BIT(DPU_CTL_VM_CFG) | \
         BIT(DPU_CTL_DSPP_SUB_BLOCK_FLUSH))
 
 #define INTF_SC7180_MASK \
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 
83e0a0905d7ee59a2be0478865bc515c3c7e193f..1acc1a7d0a365e511d5b6d7cc236e1c28062c76e
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -134,14 +134,12 @@ enum {
 /**
  * CTL sub-blocks
  * @DPU_CTL_SPLIT_DISPLAY:     CTL supports video mode split display
- * @DPU_CTL_FETCH_ACTIVE:      Active CTL for fetch HW (SSPPs)
  * @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_FETCH_ACTIVE,
        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 
59d25916d2d412113768d71a76a6aed4c879299a..f0dbb00737df2b4ade540eb440cb3ae0baf7c153
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c
@@ -758,7 +758,7 @@ struct dpu_hw_ctl *dpu_hw_ctl_init(struct drm_device *dev,
        else
                c->ops.update_pending_flush_dspp = 
dpu_hw_ctl_update_pending_flush_dspp;
 
-       if (c->caps->features & BIT(DPU_CTL_FETCH_ACTIVE))
+       if (mdss_ver->core_major_ver >= 7)
                c->ops.set_active_pipes = dpu_hw_ctl_set_fetch_pipe_active;
 
        c->idx = cfg->id;

-- 
2.39.5