[Freedreno] [PATCH 1/6] drm/msm: Remove dpu_encoder_phys_ops->hw_reset()

[Jeykumar Sankaran]

On 2018-09-20 07:58, Sean Paul wrote:
> From: Sean Paul <seanpaul at chromium.org>
> 
> We call out of the virt encoder into phys only to call back into the
> virt for hw reset. So remove the indirection and just call the virt
> function directly.
> 
> Signed-off-by: Sean Paul <seanpaul at chromium.org>

Reviewed-by: Jeykumar Sankaran <jsanka at codeaurora.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c          |  6 ++----
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h     | 12 ------------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c |  1 -
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c |  1 -
>  4 files changed, 2 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 8f6880db5c99..7842b66fbe2e 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1509,7 +1509,7 @@ static int dpu_encoder_helper_wait_event_timeout(
>  	return rc;
>  }
> 
> -void dpu_encoder_helper_hw_reset(struct dpu_encoder_phys *phys_enc)
> +static void dpu_encoder_helper_hw_reset(struct dpu_encoder_phys
> *phys_enc)
>  {
>  	struct dpu_encoder_virt *dpu_enc;
>  	struct dpu_hw_ctl *ctl;
> @@ -1805,9 +1805,7 @@ void dpu_encoder_prepare_for_kickoff(struct
> drm_encoder *drm_enc,
>  	if (needs_hw_reset) {
>  		trace_dpu_enc_prepare_kickoff_reset(DRMID(drm_enc));
>  		for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> -			phys = dpu_enc->phys_encs[i];
> -			if (phys && phys->ops.hw_reset)
> -				phys->ops.hw_reset(phys);
> +
> dpu_encoder_helper_hw_reset(dpu_enc->phys_encs[i]);
>  		}
>  	}
>  }
> 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 964efcc757a4..3a67bb9f9d9d 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> @@ -114,8 +114,6 @@ struct dpu_encoder_virt_ops {
>   * @handle_post_kickoff:	Do any work necessary post-kickoff work
>   * @trigger_start:		Process start event on physical encoder
>   * @needs_single_flush:		Whether encoder slaves need to be
> flushed
> - * @hw_reset:			Issue HW recovery such as CTL reset and
> clear
> - *				DPU_ENC_ERR_NEEDS_HW_RESET state
>   * @irq_control:		Handler to enable/disable all the encoder
> IRQs
>   * @prepare_idle_pc:		phys encoder can update the vsync_enable
> status
>   *                              on idle power collapse prepare
> @@ -151,7 +149,6 @@ struct dpu_encoder_phys_ops {
>  	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);
> -	void (*hw_reset)(struct dpu_encoder_phys *phys_enc);
>  	void (*irq_control)(struct dpu_encoder_phys *phys, bool enable);
>  	void (*prepare_idle_pc)(struct dpu_encoder_phys *phys_enc);
>  	void (*restore)(struct dpu_encoder_phys *phys);
> @@ -342,15 +339,6 @@ struct dpu_encoder_phys 
> *dpu_encoder_phys_cmd_init(
>   */
>  void dpu_encoder_helper_trigger_start(struct dpu_encoder_phys 
> *phys_enc);
> 
> -/**
> - * dpu_encoder_helper_hw_reset - issue ctl hw reset
> - *	This helper function may be optionally specified by physical
> - *	encoders if they require ctl hw reset. If state is currently
> - *	DPU_ENC_ERR_NEEDS_HW_RESET, it is set back to DPU_ENC_ENABLED.
> - * @phys_enc: Pointer to physical encoder structure
> - */
> -void dpu_encoder_helper_hw_reset(struct dpu_encoder_phys *phys_enc);
> -
>  static inline enum dpu_3d_blend_mode
> dpu_encoder_helper_get_3d_blend_mode(
>  		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 b2d7f0ded24c..c30ae05b3349 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
> @@ -776,7 +776,6 @@ static void dpu_encoder_phys_cmd_init_ops(
>  	ops->wait_for_vblank = dpu_encoder_phys_cmd_wait_for_vblank;
>  	ops->trigger_start = dpu_encoder_phys_cmd_trigger_start;
>  	ops->needs_single_flush = dpu_encoder_phys_cmd_needs_single_flush;
> -	ops->hw_reset = dpu_encoder_helper_hw_reset;
>  	ops->irq_control = dpu_encoder_phys_cmd_irq_control;
>  	ops->restore = dpu_encoder_phys_cmd_enable_helper;
>  	ops->prepare_idle_pc = dpu_encoder_phys_cmd_prepare_idle_pc;
> 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 84de385a9f62..283a2491f3e3 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
> @@ -766,7 +766,6 @@ static void dpu_encoder_phys_vid_init_ops(struct
> dpu_encoder_phys_ops *ops)
>  	ops->prepare_for_kickoff =
> dpu_encoder_phys_vid_prepare_for_kickoff;
>  	ops->handle_post_kickoff =
> dpu_encoder_phys_vid_handle_post_kickoff;
>  	ops->needs_single_flush = dpu_encoder_phys_vid_needs_single_flush;
> -	ops->hw_reset = dpu_encoder_helper_hw_reset;
>  	ops->get_line_count = dpu_encoder_phys_vid_get_line_count;
>  }

-- 
Jeykumar S