Re: [PATCH v4 14/30] drm/msm/dpu: get rid of DPU_INTF_STATUS_SUPPORTED

[neil . armstrong]

On 19/05/2025 18:04, Dmitry Baryshkov wrote:

From: Dmitry Baryshkov <dmitry.barysh...@linaro.org>

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

Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.barysh...@oss.qualcomm.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_intf.c    | 3 +--
  3 files changed, 2 insertions(+), 6 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 
1244dd59648d11123c507a1369f28f952d047fd5..4482f2fe6f04e58408b55994d885ea1c717c6a07
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
@@ -105,8 +105,7 @@
        (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC))

#define INTF_SC7180_MASK \

-       (BIT(DPU_INTF_INPUT_CTRL) | \
-        BIT(DPU_INTF_STATUS_SUPPORTED))
+       (BIT(DPU_INTF_INPUT_CTRL))

#define WB_SDM845_MASK (BIT(DPU_WB_LINE_MODE) | \

                         BIT(DPU_WB_UBWC) | \
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 
bf6b2392efb47fa8c3e3c5d17f1a72341872e18b..e1c6df3a3b72ffb5a816bd18266a35abe723fbd9
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -143,12 +143,10 @@ enum {
   * INTF sub-blocks
   * @DPU_INTF_INPUT_CTRL             Supports the setting of pp block from 
which
   *                                  pixel data arrives to this INTF
- * @DPU_INTF_STATUS_SUPPORTED       INTF block has INTF_STATUS register
   * @DPU_INTF_MAX
   */
  enum {
        DPU_INTF_INPUT_CTRL = 0x1,
-       DPU_INTF_STATUS_SUPPORTED,
        DPU_INTF_MAX
  };

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c

index 
8f9733aad2dec3a9b5464d55b00f350348842911..54c2e984ef0ce604e3eda49595d2816ea41bd7fd
 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c
@@ -308,9 +308,8 @@ static void dpu_hw_intf_get_status(
                struct dpu_hw_intf_status *s)
  {
        struct dpu_hw_blk_reg_map *c = &intf->hw;
-       unsigned long cap = intf->cap->features;

- if (cap & BIT(DPU_INTF_STATUS_SUPPORTED))

+       if (intf->mdss_ver->core_major_ver >= 5)
                s->is_en = DPU_REG_READ(c, INTF_STATUS) & BIT(0);
        else
                s->is_en = DPU_REG_READ(c, INTF_TIMING_ENGINE_EN);

Reviewed-by: Neil Armstrong <neil.armstr...@linaro.org>