Re: [PATCH v7 6/9] drm: writeback: rename drm_writeback_connector_init_with_encoder()

[Chaoyi Chen]

On 10/19/2026 9:12 PM, Dmitry Baryshkov wrote:
> Rename drm_writeback_connector_init_with_encoder() to
> drm_writeback_connector_init() and adapt its interface to follow
> drmm_writeback_connector_init(). Drop references to the "custom encoder"
> from the documentation since it's now the only way to specify the
> encoder to the writeback connector.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxxxxxxxx>
> ---
>  .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c    | 10 +++++-----
>  .../drm/arm/display/komeda/komeda_wb_connector.c    |  8 ++++----
>  drivers/gpu/drm/arm/malidp_mw.c                     |  8 ++++----
>  drivers/gpu/drm/drm_writeback.c                     | 21 +++++++++------------
>  drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c | 10 +++++-----
>  drivers/gpu/drm/vc4/vc4_txp.c                       |  8 ++++----
>  include/drm/drm_writeback.h                         | 10 +++++-----
>  7 files changed, 36 insertions(+), 39 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
> index b5b186e4f81c..18bee44794ce 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
> @@ -261,11 +261,11 @@ int amdgpu_dm_wb_connector_init(struct amdgpu_display_manager *dm,
>  
>  	drm_connector_helper_add(&wbcon->base.base, &amdgpu_dm_wb_conn_helper_funcs);
>  
> -	res = drm_writeback_connector_init_with_encoder(&dm->adev->ddev, &wbcon->base,
> -							&wbcon->encoder,
> -							&amdgpu_dm_wb_connector_funcs,
> -							amdgpu_dm_wb_formats,
> -							ARRAY_SIZE(amdgpu_dm_wb_formats));
> +	res = drm_writeback_connector_init(&dm->adev->ddev, &wbcon->base,
> +					   &amdgpu_dm_wb_connector_funcs,
> +					   &wbcon->encoder,
> +					   amdgpu_dm_wb_formats,
> +					   ARRAY_SIZE(amdgpu_dm_wb_formats));
>  	if (res) {
>  		drm_encoder_cleanup(&wbcon->encoder);
>  		return res;
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
> index 77aecf4d3f09..7c64facfd799 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
> @@ -186,10 +186,10 @@ static int komeda_wb_connector_add(struct komeda_kms_dev *kms,
>  		return err;
>  	}
>  
> -	err = drm_writeback_connector_init_with_encoder(&kms->base, wb_conn,
> -							wb_encoder,
> -							&komeda_wb_connector_funcs,
> -							formats, n_formats);
> +	err = drm_writeback_connector_init(&kms->base, wb_conn,
> +					   &komeda_wb_connector_funcs,
> +					   wb_encoder,
> +					   formats, n_formats);
>  	komeda_put_fourcc_list(formats);
>  	if (err) {
>  		drm_encoder_cleanup(wb_encoder);
> diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
> index 7f5e25adf999..7e1d1c0988ae 100644
> --- a/drivers/gpu/drm/arm/malidp_mw.c
> +++ b/drivers/gpu/drm/arm/malidp_mw.c
> @@ -240,10 +240,10 @@ int malidp_mw_connector_init(struct drm_device *drm)
>  		return ret;
>  	}
>  
> -	ret = drm_writeback_connector_init_with_encoder(drm, &malidp->mw_connector,
> -							&malidp->mw_encoder,
> -							&malidp_mw_connector_funcs,
> -							formats, n_formats);
> +	ret = drm_writeback_connector_init(drm, &malidp->mw_connector,
> +					   &malidp_mw_connector_funcs,
> +					   &malidp->mw_encoder,
> +					   formats, n_formats);
>  	kfree(formats);
>  	if (ret) {
>  		drm_encoder_cleanup(&malidp->mw_encoder);
> diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
> index 683da368e339..89c36f1414ce 100644
> --- a/drivers/gpu/drm/drm_writeback.c
> +++ b/drivers/gpu/drm/drm_writeback.c
> @@ -165,8 +165,7 @@ static void delete_writeback_properties(struct drm_device *dev)
>  }
>  
>  /**
> - * __drm_writeback_connector_init - Initialize a writeback connector with
> - * a custom encoder
> + * __drm_writeback_connector_init - Initialize a writeback connector
>   *
>   * @dev: DRM device
>   * @wb_connector: Writeback connector to initialize
> @@ -241,8 +240,7 @@ static int __drm_writeback_connector_init(struct drm_device *dev,
>  }
>  
>  /**
> - * drm_writeback_connector_init_with_encoder - Initialize a writeback connector with
> - * a custom encoder
> + * drm_writeback_connector_init - Initialize a writeback connector
>   *
>   * @dev: DRM device
>   * @wb_connector: Writeback connector to initialize
> @@ -269,11 +267,11 @@ static int __drm_writeback_connector_init(struct drm_device *dev,
>   *
>   * Returns: 0 on success, or a negative error code
>   */
> -int drm_writeback_connector_init_with_encoder(struct drm_device *dev,
> -					      struct drm_writeback_connector *wb_connector,
> -					      struct drm_encoder *enc,
> -					      const struct drm_connector_funcs *con_funcs,
> -					      const u32 *formats, int n_formats)
> +int drm_writeback_connector_init(struct drm_device *dev,
> +				 struct drm_writeback_connector *wb_connector,
> +				 const struct drm_connector_funcs *con_funcs,
> +				 struct drm_encoder *enc,
> +				 const u32 *formats, int n_formats)
>  {
>  	struct drm_connector *connector = &wb_connector->base;
>  	int ret;
> @@ -290,7 +288,7 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev,
>  
>  	return ret;
>  }
> -EXPORT_SYMBOL(drm_writeback_connector_init_with_encoder);
> +EXPORT_SYMBOL(drm_writeback_connector_init);
>  
>  /**
>   * drm_writeback_connector_cleanup - Cleanup the writeback connector
> @@ -320,8 +318,7 @@ static void drm_writeback_connector_cleanup(struct drm_device *dev,
>  }
>  
>  /**
> - * drmm_writeback_connector_init - Initialize a writeback connector with
> - * a custom encoder
> + * drmm_writeback_connector_init - Initialize a writeback connector
>   *
>   * @dev: DRM device
>   * @wb_connector: Writeback connector to initialize
> diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> index b0c1ca0d0dfa..35460a314a7f 100644
> --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> @@ -219,11 +219,11 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu,
>  	drm_connector_helper_add(&wb_conn->base,
>  				 &rcar_du_wb_conn_helper_funcs);
>  
> -	ret = drm_writeback_connector_init_with_encoder(&rcdu->ddev, wb_conn,
> -							encoder,
> -							&rcar_du_wb_conn_funcs,
> -							writeback_formats,
> -							ARRAY_SIZE(writeback_formats));
> +	ret = drm_writeback_connector_init(&rcdu->ddev, wb_conn,
> +					   &rcar_du_wb_conn_funcs,
> +					   encoder,
> +					   writeback_formats,
> +					   ARRAY_SIZE(writeback_formats));
>  	if (ret)
>  		drm_encoder_cleanup(encoder);
>  
> diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
> index c469f8b1068b..33b1bc37b362 100644
> --- a/drivers/gpu/drm/vc4/vc4_txp.c
> +++ b/drivers/gpu/drm/vc4/vc4_txp.c
> @@ -601,10 +601,10 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
>  
>  	drm_connector_helper_add(&txp->connector.base,
>  				 &vc4_txp_connector_helper_funcs);
> -	ret = drm_writeback_connector_init_with_encoder(drm, &txp->connector,
> -							encoder,
> -							&vc4_txp_connector_funcs,
> -							drm_fmts, ARRAY_SIZE(drm_fmts));
> +	ret = drm_writeback_connector_init(drm, &txp->connector,
> +					   &vc4_txp_connector_funcs,
> +					   encoder,
> +					   drm_fmts, ARRAY_SIZE(drm_fmts));
>  	if (ret)
>  		return ret;
>  
> diff --git a/include/drm/drm_writeback.h b/include/drm/drm_writeback.h
> index 879ca103320c..958466a05e60 100644
> --- a/include/drm/drm_writeback.h
> +++ b/include/drm/drm_writeback.h
> @@ -137,11 +137,11 @@ drm_connector_to_writeback(struct drm_connector *connector)
>  	return container_of(connector, struct drm_writeback_connector, base);
>  }
>  
> -int drm_writeback_connector_init_with_encoder(struct drm_device *dev,
> -				struct drm_writeback_connector *wb_connector,
> -				struct drm_encoder *enc,
> -				const struct drm_connector_funcs *con_funcs, const u32 *formats,
> -				int n_formats);
> +int drm_writeback_connector_init(struct drm_device *dev,
> +				 struct drm_writeback_connector *wb_connector,
> +				 const struct drm_connector_funcs *con_funcs,
> +				 struct drm_encoder *enc,
> +				 const u32 *formats, int n_formats);
>  
>  int drmm_writeback_connector_init(struct drm_device *dev,
>  				  struct drm_writeback_connector *wb_connector,
> 

Looks good to me. 

Reviewed-by: Chaoyi Chen <chaoyi.chen@xxxxxxxxxxxxxx>

-- 
Best, 
Chaoyi