Re: [PATCH 07/12] drm/msm/dpu: add encoder operations to prepare/cleanup wb job

[Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>]

On 05/02/2022 00:17, Abhinav Kumar wrote:
> add dpu encoder APIs to prepare and cleanup writeback job
> for the writeback encoder. These shall be invoked from the
> prepare_wb_job/cleanup_wb_job hooks of the drm_writeback
> framework.

Having dpu-encoder-wide API for the single case of WB looks like an 
overkill. But I think we have no other choice here.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>

> Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
> ---
>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c      | 34 ++++++++++++++++++++++++
>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h      | 16 +++++++++++
>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h |  5 ++++
>   3 files changed, 55 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 947069b..b51a677 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -958,6 +958,40 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc,
>   	return 0;
>   }
>   
> +void dpu_encoder_prepare_wb_job(struct drm_encoder *drm_enc,
> +		struct drm_writeback_job *job)
> +{
> +	struct dpu_encoder_virt *dpu_enc;
> +	int i;
> +
> +	dpu_enc = to_dpu_encoder_virt(drm_enc);
> +
> +	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> +		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> +
> +		if (phys->ops.prepare_wb_job)
> +			phys->ops.prepare_wb_job(phys, job);
> +
> +	}
> +}
> +
> +void dpu_encoder_cleanup_wb_job(struct drm_encoder *drm_enc,
> +		struct drm_writeback_job *job)
> +{
> +	struct dpu_encoder_virt *dpu_enc;
> +	int i;
> +
> +	dpu_enc = to_dpu_encoder_virt(drm_enc);
> +
> +	for (i = 0; i < dpu_enc->num_phys_encs; i++) {
> +		struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i];
> +
> +		if (phys->ops.cleanup_wb_job)
> +			phys->ops.cleanup_wb_job(phys, job);
> +
> +	}
> +}
> +
>   static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
>   				      struct drm_display_mode *mode,
>   				      struct drm_display_mode *adj_mode)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> index cc10436..da5b6d6 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h
> @@ -171,4 +171,20 @@ int dpu_encoder_get_linecount(struct drm_encoder *drm_enc);
>    */
>   int dpu_encoder_get_vsync_count(struct drm_encoder *drm_enc);
>   
> +/**
> + * dpu_encoder_prepare_wb_job - prepare writeback job for the encoder.
> + * @drm_enc:    Pointer to previously created drm encoder structure
> + * @job:        Pointer to the current drm writeback job
> + */
> +void dpu_encoder_prepare_wb_job(struct drm_encoder *drm_enc,
> +		struct drm_writeback_job *job);
> +
> +/**
> + * dpu_encoder_cleanup_wb_job - cleanup writeback job for the encoder.
> + * @drm_enc:    Pointer to previously created drm encoder structure
> + * @job:        Pointer to the current drm writeback job
> + */
> +void dpu_encoder_cleanup_wb_job(struct drm_encoder *drm_enc,
> +		struct drm_writeback_job *job);
> +
>   #endif /* __DPU_ENCODER_H__ */
> 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 07c3525..7b3354d 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h
> @@ -7,6 +7,7 @@
>   #ifndef __DPU_ENCODER_PHYS_H__
>   #define __DPU_ENCODER_PHYS_H__
>   
> +#include <drm/drm_writeback.h>
>   #include <linux/jiffies.h>
>   
>   #include "dpu_kms.h"
> @@ -146,6 +147,10 @@ struct dpu_encoder_phys_ops {
>   	void (*restore)(struct dpu_encoder_phys *phys);
>   	int (*get_line_count)(struct dpu_encoder_phys *phys);
>   	int (*get_frame_count)(struct dpu_encoder_phys *phys);
> +	void (*prepare_wb_job)(struct dpu_encoder_phys *phys_enc,
> +			struct drm_writeback_job *job);
> +	void (*cleanup_wb_job)(struct dpu_encoder_phys *phys_enc,
> +			struct drm_writeback_job *job);
>   };
>   
>   /**


--
With best wishes
Dmitry