drm/msm/dpu: Merge setup_- and enable_tearcheck pingpong callbacks

These functions are always called consecutively and are best bundled
together for simplicity, especially when the same structure of callbacks
will be replicated later on the interface block for INTF TE support.
The enable_tearcheck(false) case is now replaced with a more obvious
disable_tearcheck(), encapsulating the original register write with 0.

Suggested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/534217/
Link: https://lore.kernel.org/r/20230411-dpu-intf-te-v4-20-27ce1a5ab5c6@somainline.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index a60fb8d..1df3745 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -327,8 +327,7 @@ static void dpu_encoder_phys_cmd_tearcheck_config(
 
        DPU_DEBUG_CMDENC(cmd_enc, "pp %d\n", phys_enc->hw_pp->idx - PINGPONG_0);
 
-       if (!phys_enc->hw_pp->ops.setup_tearcheck ||
-               !phys_enc->hw_pp->ops.enable_tearcheck) {
+       if (!phys_enc->hw_pp->ops.enable_tearcheck) {
                DPU_DEBUG_CMDENC(cmd_enc, "tearcheck not supported\n");
                return;
        }
@@ -383,8 +382,7 @@ static void dpu_encoder_phys_cmd_tearcheck_config(
                phys_enc->hw_pp->idx - PINGPONG_0, tc_cfg.sync_cfg_height,
                tc_cfg.sync_threshold_start, tc_cfg.sync_threshold_continue);
 
-       phys_enc->hw_pp->ops.setup_tearcheck(phys_enc->hw_pp, &tc_cfg);
-       phys_enc->hw_pp->ops.enable_tearcheck(phys_enc->hw_pp, tc_enable);
+       phys_enc->hw_pp->ops.enable_tearcheck(phys_enc->hw_pp, &tc_cfg);
 }
 
 static void _dpu_encoder_phys_cmd_pingpong_config(
@@ -511,8 +509,8 @@ static void dpu_encoder_phys_cmd_disable(struct dpu_encoder_phys *phys_enc)
                return;
        }
 
-       if (phys_enc->hw_pp->ops.enable_tearcheck)
-               phys_enc->hw_pp->ops.enable_tearcheck(phys_enc->hw_pp, false);
+       if (phys_enc->hw_pp->ops.disable_tearcheck)
+               phys_enc->hw_pp->ops.disable_tearcheck(phys_enc->hw_pp);
 
        if (phys_enc->hw_intf->ops.bind_pingpong_blk) {
                phys_enc->hw_intf->ops.bind_pingpong_blk(

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
index c70f6ff..79e4576 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
@@ -73,7 +73,7 @@ static void dpu_hw_pp_setup_dither(struct dpu_hw_pingpong *pp,
        DPU_REG_WRITE(c, base + PP_DITHER_EN, 1);
 }
 
-static int dpu_hw_pp_setup_te_config(struct dpu_hw_pingpong *pp,
+static int dpu_hw_pp_enable_te(struct dpu_hw_pingpong *pp,
                struct dpu_hw_tear_check *te)
 {
        struct dpu_hw_blk_reg_map *c;
@@ -100,6 +100,8 @@ static int dpu_hw_pp_setup_te_config(struct dpu_hw_pingpong *pp,
        DPU_REG_WRITE(c, PP_SYNC_WRCOUNT,
                        (te->start_pos + te->sync_threshold_start + 1));
 
+       DPU_REG_WRITE(c, PP_TEAR_CHECK_EN, 1);
+
        return 0;
 }
 
@@ -126,7 +128,7 @@ static bool dpu_hw_pp_get_autorefresh_config(struct dpu_hw_pingpong *pp,
        return !!((val & BIT(31)) >> 31);
 }
 
-static int dpu_hw_pp_enable_te(struct dpu_hw_pingpong *pp, bool enable)
+static int dpu_hw_pp_disable_te(struct dpu_hw_pingpong *pp)
 {
        struct dpu_hw_blk_reg_map *c;
 
@@ -134,7 +136,7 @@ static int dpu_hw_pp_enable_te(struct dpu_hw_pingpong *pp, bool enable)
                return -EINVAL;
        c = &pp->hw;
 
-       DPU_REG_WRITE(c, PP_TEAR_CHECK_EN, enable);
+       DPU_REG_WRITE(c, PP_TEAR_CHECK_EN, 0);
        return 0;
 }
 
@@ -283,8 +285,8 @@ static void _setup_pingpong_ops(struct dpu_hw_pingpong *c,
                                unsigned long features)
 {
        if (test_bit(DPU_PINGPONG_TE, &features)) {
-               c->ops.setup_tearcheck = dpu_hw_pp_setup_te_config;
                c->ops.enable_tearcheck = dpu_hw_pp_enable_te;
+               c->ops.disable_tearcheck = dpu_hw_pp_disable_te;
                c->ops.connect_external_te = dpu_hw_pp_connect_external_te;
                c->ops.get_line_count = dpu_hw_pp_get_line_count;
                c->ops.disable_autorefresh = dpu_hw_pp_disable_autorefresh;

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h
index 08ba9d7..d3246a9 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h
@@ -37,8 +37,8 @@ struct dpu_hw_dither_cfg {
  *
  * struct dpu_hw_pingpong_ops : Interface to the pingpong Hw driver functions
  *  Assumption is these functions will be called after clocks are enabled
- *  @setup_tearcheck : program tear check values
- *  @enable_tearcheck : enables tear check
+ *  @enable_tearcheck: program and enable tear check block
+ *  @disable_tearcheck: disable able tear check block
  *  @setup_dither : function to program the dither hw block
  *  @get_line_count: obtain current vertical line counter
  */
@@ -47,14 +47,13 @@ struct dpu_hw_pingpong_ops {
         * enables vysnc generation and sets up init value of
         * read pointer and programs the tear check cofiguration
         */
-       int (*setup_tearcheck)(struct dpu_hw_pingpong *pp,
+       int (*enable_tearcheck)(struct dpu_hw_pingpong *pp,
                        struct dpu_hw_tear_check *cfg);
 
        /**
-        * enables tear check block
+        * disables tear check block
         */
-       int (*enable_tearcheck)(struct dpu_hw_pingpong *pp,
-                       bool enable);
+       int (*disable_tearcheck)(struct dpu_hw_pingpong *pp);
 
        /**
         * read, modify, write to either set or clear listening to external TE