Commit d3db61ca authored by Bruce Wang's avatar Bruce Wang Committed by Sean Paul

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: default avatarBruce Wang <bzwang@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parent 45815d09
...@@ -716,11 +716,8 @@ void dpu_crtc_commit_kickoff(struct drm_crtc *crtc, bool async) ...@@ -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) * may delay and flush at an irq event (e.g. ppdone)
*/ */
drm_for_each_encoder_mask(encoder, crtc->dev, drm_for_each_encoder_mask(encoder, crtc->dev,
crtc->state->encoder_mask) { crtc->state->encoder_mask)
struct dpu_encoder_kickoff_params params = { 0 }; dpu_encoder_prepare_for_kickoff(encoder, async);
dpu_encoder_prepare_for_kickoff(encoder, &params, async);
}
if (!async) { if (!async) {
/* wait for frame_event_done completion */ /* wait for frame_event_done completion */
......
...@@ -1745,15 +1745,14 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work) ...@@ -1745,15 +1745,14 @@ static void dpu_encoder_vsync_event_work_handler(struct kthread_work *work)
nsecs_to_jiffies(ktime_to_ns(wakeup_time))); nsecs_to_jiffies(ktime_to_ns(wakeup_time)));
} }
void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, bool async)
struct dpu_encoder_kickoff_params *params, bool async)
{ {
struct dpu_encoder_virt *dpu_enc; struct dpu_encoder_virt *dpu_enc;
struct dpu_encoder_phys *phys; struct dpu_encoder_phys *phys;
bool needs_hw_reset = false; bool needs_hw_reset = false;
unsigned int i; unsigned int i;
if (!drm_enc || !params) { if (!drm_enc) {
DPU_ERROR("invalid args\n"); DPU_ERROR("invalid args\n");
return; return;
} }
...@@ -1767,7 +1766,7 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc, ...@@ -1767,7 +1766,7 @@ void dpu_encoder_prepare_for_kickoff(struct drm_encoder *drm_enc,
phys = dpu_enc->phys_encs[i]; phys = dpu_enc->phys_encs[i];
if (phys) { if (phys) {
if (phys->ops.prepare_for_kickoff) 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) if (phys->enable_state == DPU_ENC_ERR_NEEDS_HW_RESET)
needs_hw_reset = true; needs_hw_reset = true;
} }
......
...@@ -37,15 +37,6 @@ struct dpu_encoder_hw_resources { ...@@ -37,15 +37,6 @@ struct dpu_encoder_hw_resources {
enum dpu_intf_mode intfs[INTF_MAX]; enum dpu_intf_mode intfs[INTF_MAX];
}; };
/**
* 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 * dpu_encoder_get_hw_resources - Populate table of required hardware resources
* @encoder: encoder pointer * @encoder: encoder pointer
...@@ -88,11 +79,9 @@ void dpu_encoder_register_frame_event_callback(struct drm_encoder *encoder, ...@@ -88,11 +79,9 @@ void dpu_encoder_register_frame_event_callback(struct drm_encoder *encoder,
* Immediately: if no previous commit is outstanding. * Immediately: if no previous commit is outstanding.
* Delayed: Block until next trigger can be issued. * Delayed: Block until next trigger can be issued.
* @encoder: encoder pointer * @encoder: encoder pointer
* @params: kickoff time parameters
* @async: true if this is an asynchronous commit * @async: true if this is an asynchronous commit
*/ */
void dpu_encoder_prepare_for_kickoff(struct drm_encoder *encoder, void dpu_encoder_prepare_for_kickoff(struct drm_encoder *encoder, bool async);
struct dpu_encoder_kickoff_params *params, bool async);
/** /**
* dpu_encoder_trigger_kickoff_pending - Clear the flush bits from previous * dpu_encoder_trigger_kickoff_pending - Clear the flush bits from previous
......
...@@ -144,8 +144,7 @@ struct dpu_encoder_phys_ops { ...@@ -144,8 +144,7 @@ struct dpu_encoder_phys_ops {
int (*wait_for_commit_done)(struct dpu_encoder_phys *phys_enc); 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_tx_complete)(struct dpu_encoder_phys *phys_enc);
int (*wait_for_vblank)(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, void (*prepare_for_kickoff)(struct dpu_encoder_phys *phys_enc);
struct dpu_encoder_kickoff_params *params);
void (*handle_post_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); void (*trigger_start)(struct dpu_encoder_phys *phys_enc);
bool (*needs_single_flush)(struct dpu_encoder_phys *phys_enc); bool (*needs_single_flush)(struct dpu_encoder_phys *phys_enc);
......
...@@ -594,8 +594,7 @@ static void dpu_encoder_phys_cmd_get_hw_resources( ...@@ -594,8 +594,7 @@ static void dpu_encoder_phys_cmd_get_hw_resources(
} }
static void dpu_encoder_phys_cmd_prepare_for_kickoff( static void dpu_encoder_phys_cmd_prepare_for_kickoff(
struct dpu_encoder_phys *phys_enc, struct dpu_encoder_phys *phys_enc)
struct dpu_encoder_kickoff_params *params)
{ {
struct dpu_encoder_phys_cmd *cmd_enc = struct dpu_encoder_phys_cmd *cmd_enc =
to_dpu_encoder_phys_cmd(phys_enc); to_dpu_encoder_phys_cmd(phys_enc);
...@@ -693,7 +692,7 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done( ...@@ -693,7 +692,7 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(
/* required for both controllers */ /* required for both controllers */
if (!rc && cmd_enc->serialize_wait4pp) 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; return rc;
} }
......
...@@ -587,14 +587,13 @@ static int dpu_encoder_phys_vid_wait_for_vblank( ...@@ -587,14 +587,13 @@ static int dpu_encoder_phys_vid_wait_for_vblank(
} }
static void dpu_encoder_phys_vid_prepare_for_kickoff( static void dpu_encoder_phys_vid_prepare_for_kickoff(
struct dpu_encoder_phys *phys_enc, struct dpu_encoder_phys *phys_enc)
struct dpu_encoder_kickoff_params *params)
{ {
struct dpu_encoder_phys_vid *vid_enc; struct dpu_encoder_phys_vid *vid_enc;
struct dpu_hw_ctl *ctl; struct dpu_hw_ctl *ctl;
int rc; int rc;
if (!phys_enc || !params) { if (!phys_enc) {
DPU_ERROR("invalid encoder/parameters\n"); DPU_ERROR("invalid encoder/parameters\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment