[PATCH v2 12/13] drm/msm/dpu: drop dpu_encoder_phys_ops::destroy

[Jessica Zhang]

On 7/7/2023 4:12 PM, Dmitry Baryshkov wrote:
> Drop the dpu_encoder_phys_ops' destroy() callback. No phys backend
> implements it anymore, so it is useless.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

Reviewed-by: Jessica Zhang <quic_jesszhan at quicinc.com>

> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c    | 18 ------------------
>   .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h   |  2 --
>   2 files changed, 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 7c2cd9ce8acd..b42176ce4a3a 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -456,24 +456,6 @@ static void dpu_encoder_destroy(struct drm_encoder *drm_enc)
>   	dpu_enc = to_dpu_encoder_virt(drm_enc);
>   	DPU_DEBUG_ENC(dpu_enc, "\n");
>   
> -	mutex_lock(&dpu_enc->enc_lock);
> -
> -	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> -		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> -
> -		if (phys->ops.destroy) {
> -			phys->ops.destroy(phys);
> -			--dpu_enc->num_phys_encs;
> -			dpu_enc->phys_encs[i] = NULL;
> -		}
> -	}
> -
> -	if (dpu_enc->num_phys_encs)
> -		DPU_ERROR_ENC(dpu_enc, "expected 0 num_phys_encs not %d\n",
> -				dpu_enc->num_phys_encs);
> -	dpu_enc->num_phys_encs = 0;
> -	mutex_unlock(&dpu_enc->enc_lock);
> -
>   	drm_encoder_cleanup(drm_enc);
>   	mutex_destroy(&dpu_enc->enc_lock);
>   }
> 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 4fb0d95f3061..757ce58f958b 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> @@ -72,7 +72,6 @@ struct dpu_encoder_phys;
>    * @enable:			DRM Call. Enable a DRM mode.
>    * @disable:			DRM Call. Disable mode.
>    * @atomic_check:		DRM Call. Atomic check new DRM state.
> - * @destroy:			DRM Call. Destroy and release resources.
>    * @control_vblank_irq		Register/Deregister for VBLANK IRQ
>    * @wait_for_commit_done:	Wait for hardware to have flushed the
>    *				current pending frames to hardware
> @@ -102,7 +101,6 @@ struct dpu_encoder_phys_ops {
>   	int (*atomic_check)(struct dpu_encoder_phys *encoder,
>   			    struct drm_crtc_state *crtc_state,
>   			    struct drm_connector_state *conn_state);
> -	void (*destroy)(struct dpu_encoder_phys *encoder);
>   	int (*control_vblank_irq)(struct dpu_encoder_phys *enc, bool enable);
>   	int (*wait_for_commit_done)(struct dpu_encoder_phys *phys_enc);
>   	int (*wait_for_tx_complete)(struct dpu_encoder_phys *phys_enc);
> -- 
> 2.39.2
>