drm/msm/dpu: remove struct encoder_kickoff_params

The contents of struct encoder_kickoff_params are never used. Remove the
structure and all remnants of it from function calls.

Changes in v2 (seanpaul):
- Actually remove the struct (Jeykumar)

Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Bruce Wang <bzwang@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index d6e6925..4b599b7 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -716,11 +716,8 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async)
         * may delay and flush at an irq event (e.g. ppdone)
         */
        drm_for_each_encoder_mask(encoder, crtc->dev,
-                                 crtc->state->encoder_mask) {
-               struct dpu_encoder_kickoff_params params = { 0 };
-               dpu_encoder_prepare_for_kickoff(encoder, &params, async);
-       }
-
+                                 crtc->state->encoder_mask)
+               dpu_encoder_prepare_for_kickoff(encoder, async);
 
        if (!async) {
                /* wait for frame_event_done completion */

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 3d1e1e4..11a5f28 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1745,15 +1745,14 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work)
                        nsecs_to_jiffies(ktime_to_ns(wakeup_time)));
 }
 
-void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc,
-               struct dpu_encoder_kickoff_params *params, bool async)
+void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, bool async)
 {
        struct dpu_encoder_virt *dpu_enc;
        struct dpu_encoder_phys *phys;
        bool needs_hw_reset = false;
        unsigned int i;
 
-       if (!drm_enc || !params) {
+       if (!drm_enc) {
                DPU_ERROR("invalid args\n");
                return;
        }
@@ -1767,7 +1766,7 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc,
                phys = dpu_enc->phys_encs[i];
                if (phys) {
                        if (phys->ops.prepare_for_kickoff)
-                               phys->ops.prepare_for_kickoff(phys, params);
+                               phys->ops.prepare_for_kickoff(phys);
                        if (phys->enable_state == DPU_ENC_ERR_NEEDS_HW_RESET)
                                needs_hw_reset = true;
                }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
index 3f5dafe..d77f74f 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
@@ -38,15 +38,6 @@ struct dpu_encoder_hw_resources {
 };
 
 /**
- * dpu_encoder_kickoff_params - info encoder requires at kickoff
- * @affected_displays:  bitmask, bit set means the ROI of the commit lies within
- *                      the bounds of the physical display at the bit index
- */
-struct dpu_encoder_kickoff_params {
-       unsigned long affected_displays;
-};
-
-/**
  * dpu_encoder_get_hw_resources - Populate table of required hardware resources
  * @encoder:   encoder pointer
  * @hw_res:    resource table to populate with encoder required resources
@@ -88,11 +79,9 @@ void dpu_encoder_register_frame_event_callback(struct drm_encoder *encoder,
  *     Immediately: if no previous commit is outstanding.
  *     Delayed: Block until next trigger can be issued.
  * @encoder:   encoder pointer
- * @params:    kickoff time parameters
  * @async:     true if this is an asynchronous commit
  */
-void dpu_encoder_prepare_for_kickoff(struct drm_encoder *encoder,
-               struct dpu_encoder_kickoff_params *params, bool async);
+void dpu_encoder_prepare_for_kickoff(struct drm_encoder *encoder,  bool async);
 
 /**
  * dpu_encoder_trigger_kickoff_pending - Clear the flush bits from previous

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
index 44e6f8b..db94f3d 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
@@ -144,8 +144,7 @@ struct dpu_encoder_phys_ops {
        int (*wait_for_commit_done)(struct dpu_encoder_phys *phys_enc);
        int (*wait_for_tx_complete)(struct dpu_encoder_phys *phys_enc);
        int (*wait_for_vblank)(struct dpu_encoder_phys *phys_enc);
-       void (*prepare_for_kickoff)(struct dpu_encoder_phys *phys_enc,
-                       struct dpu_encoder_kickoff_params *params);
+       void (*prepare_for_kickoff)(struct dpu_encoder_phys *phys_enc);
        void (*handle_post_kickoff)(struct dpu_encoder_phys *phys_enc);
        void (*trigger_start)(struct dpu_encoder_phys *phys_enc);
        bool (*needs_single_flush)(struct dpu_encoder_phys *phys_enc);

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 99ab5ca..a399e1e 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
@@ -594,8 +594,7 @@ static void dpu_encoder_phys_cmd_get_hw_resources(
 }
 
 static void dpu_encoder_phys_cmd_prepare_for_kickoff(
-               struct dpu_encoder_phys *phys_enc,
-               struct dpu_encoder_kickoff_params *params)
+               struct dpu_encoder_phys *phys_enc)
 {
        struct dpu_encoder_phys_cmd *cmd_enc =
                        to_dpu_encoder_phys_cmd(phys_enc);
@@ -693,7 +692,7 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(
 
        /* required for both controllers */
        if (!rc && cmd_enc->serialize_wait4pp)
-               dpu_encoder_phys_cmd_prepare_for_kickoff(phys_enc, NULL);
+               dpu_encoder_phys_cmd_prepare_for_kickoff(phys_enc);
 
        return rc;
 }

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index acdab5b..3c4eb47 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -587,14 +587,13 @@ static int dpu_encoder_phys_vid_wait_for_vblank(
 }
 
 static void dpu_encoder_phys_vid_prepare_for_kickoff(
-               struct dpu_encoder_phys *phys_enc,
-               struct dpu_encoder_kickoff_params *params)
+               struct dpu_encoder_phys *phys_enc)
 {
        struct dpu_encoder_phys_vid *vid_enc;
        struct dpu_hw_ctl *ctl;
        int rc;
 
-       if (!phys_enc || !params) {
+       if (!phys_enc) {
                DPU_ERROR("invalid encoder/parameters\n");
                return;
        }