[v1] Refactor drm_writeback_connector structure

[RFC PATCH 7/8] drm/rcar_du: Adapt vkms writeback to new drm_writeback_connector

Posted by Suraj Kandpal 6 months ago

Now that drm_writeback_connector is embedded with the drm_connector
adapt the rcar-du writeback functionality to this changes. This
includes changing the drm_writeback_connector to be changed to drm_connector
within the rcar_du_crtc.
Some other changes are done which are a result of the all the above
changes mentioned.

Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
 .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h    |  4 ++--
 .../drm/renesas/rcar-du/rcar_du_writeback.c   | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
index d0f38a8b3561..457c803d75bc 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
@@ -72,11 +72,11 @@ struct rcar_du_crtc {
 	const char *const *sources;
 	unsigned int sources_count;
 
-	struct drm_writeback_connector writeback;
+	struct drm_connector connector;
 };
 
 #define to_rcar_crtc(c)		container_of(c, struct rcar_du_crtc, crtc)
-#define wb_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, writeback)
+#define connector_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, connector)
 
 /**
  * struct rcar_du_crtc_state - Driver-specific CRTC state
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 9986a10e8114..95e6810612c2 100644
--- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
+++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
@@ -47,10 +47,12 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector *connector)
 				    dev->mode_config.max_height);
 }
 
-static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
+static int rcar_du_wb_prepare_job(struct drm_writeback_connector *wb_connector,
 				  struct drm_writeback_job *job)
 {
-	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
+	struct drm_connector *connector =
+		container_of(wb_connector, struct drm_connector, writeback);
+	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
 	struct rcar_du_wb_job *rjob;
 	int ret;
 
@@ -72,10 +74,12 @@ static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
 	return 0;
 }
 
-static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connector,
+static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *wb_connector,
 				   struct drm_writeback_job *job)
 {
-	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
+	struct drm_connector *connector =
+		container_of(wb_connector, struct drm_connector, writeback);
+	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
 	struct rcar_du_wb_job *rjob = job->priv;
 
 	if (!job->fb)
@@ -199,7 +203,7 @@ static const u32 writeback_formats[] = {
 int rcar_du_writeback_init(struct rcar_du_device *rcdu,
 			   struct rcar_du_crtc *rcrtc)
 {
-	struct drm_writeback_connector *wb_conn = &rcrtc->writeback;
+	struct drm_writeback_connector *wb_conn = &rcrtc->connector.writeback;
 
 	struct drm_encoder *encoder;
 
@@ -212,7 +216,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu,
 
 	encoder->possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
 
-	drm_connector_helper_add(&wb_conn->base,
+	drm_connector_helper_add(&rcrtc->connector,
 				 &rcar_du_wb_conn_helper_funcs);
 
 	return drmm_writeback_connector_init(&rcdu->ddev, wb_conn,
@@ -231,7 +235,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
 	struct drm_framebuffer *fb;
 	unsigned int i;
 
-	state = rcrtc->writeback.base.state;
+	state = rcrtc->connector.state;
 	if (!state || !state->writeback_job)
 		return;
 
@@ -246,10 +250,10 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
 		cfg->mem[i] = sg_dma_address(rjob->sg_tables[i].sgl)
 			    + fb->offsets[i];
 
-	drm_writeback_queue_job(&rcrtc->writeback, state);
+	drm_writeback_queue_job(&rcrtc->connector.writeback, state);
 }
 
 void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc)
 {
-	drm_writeback_signal_completion(&rcrtc->writeback, 0);
+	drm_writeback_signal_completion(&rcrtc->connector.writeback, 0);
 }
-- 
2.34.1

Re: [RFC PATCH 7/8] drm/rcar_du: Adapt vkms writeback to new drm_writeback_connector

Posted by Louis Chauvet 6 months ago

I think the commit title is wrong.

Le 11/08/2025 à 11:27, Suraj Kandpal a écrit :
> Now that drm_writeback_connector is embedded with the drm_connector
> adapt the rcar-du writeback functionality to this changes. This
> includes changing the drm_writeback_connector to be changed to drm_connector
> within the rcar_du_crtc.
> Some other changes are done which are a result of the all the above
> changes mentioned.
> 
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
>   .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h    |  4 ++--
>   .../drm/renesas/rcar-du/rcar_du_writeback.c   | 22 +++++++++++--------
>   2 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> index d0f38a8b3561..457c803d75bc 100644
> --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> @@ -72,11 +72,11 @@ struct rcar_du_crtc {
>   	const char *const *sources;
>   	unsigned int sources_count;
>   
> -	struct drm_writeback_connector writeback;
> +	struct drm_connector connector;
>   };
>   
>   #define to_rcar_crtc(c)		container_of(c, struct rcar_du_crtc, crtc)
> -#define wb_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, writeback)
> +#define connector_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, connector)
>   
>   /**
>    * struct rcar_du_crtc_state - Driver-specific CRTC state
> 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 9986a10e8114..95e6810612c2 100644
> --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> @@ -47,10 +47,12 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector *connector)
>   				    dev->mode_config.max_height);
>   }
>   
> -static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
> +static int rcar_du_wb_prepare_job(struct drm_writeback_connector *wb_connector,
>   				  struct drm_writeback_job *job)
>   {
> -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> +	struct drm_connector *connector =
> +		container_of(wb_connector, struct drm_connector, writeback);
> +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
>   	struct rcar_du_wb_job *rjob;
>   	int ret;
>   
> @@ -72,10 +74,12 @@ static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
>   	return 0;
>   }
>   
> -static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connector,
> +static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *wb_connector,
>   				   struct drm_writeback_job *job)
>   {
> -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> +	struct drm_connector *connector =
> +		container_of(wb_connector, struct drm_connector, writeback);
> +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
>   	struct rcar_du_wb_job *rjob = job->priv;
>   
>   	if (!job->fb)
> @@ -199,7 +203,7 @@ static const u32 writeback_formats[] = {
>   int rcar_du_writeback_init(struct rcar_du_device *rcdu,
>   			   struct rcar_du_crtc *rcrtc)
>   {
> -	struct drm_writeback_connector *wb_conn = &rcrtc->writeback;
> +	struct drm_writeback_connector *wb_conn = &rcrtc->connector.writeback;
>   
>   	struct drm_encoder *encoder;
>   
> @@ -212,7 +216,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu,
>   
>   	encoder->possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
>   
> -	drm_connector_helper_add(&wb_conn->base,
> +	drm_connector_helper_add(&rcrtc->connector,
>   				 &rcar_du_wb_conn_helper_funcs);
>   
>   	return drmm_writeback_connector_init(&rcdu->ddev, wb_conn,
> @@ -231,7 +235,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
>   	struct drm_framebuffer *fb;
>   	unsigned int i;
>   
> -	state = rcrtc->writeback.base.state;
> +	state = rcrtc->connector.state;
>   	if (!state || !state->writeback_job)
>   		return;
>   
> @@ -246,10 +250,10 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
>   		cfg->mem[i] = sg_dma_address(rjob->sg_tables[i].sgl)
>   			    + fb->offsets[i];
>   
> -	drm_writeback_queue_job(&rcrtc->writeback, state);
> +	drm_writeback_queue_job(&rcrtc->connector.writeback, state);
>   }
>   
>   void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc)
>   {
> -	drm_writeback_signal_completion(&rcrtc->writeback, 0);
> +	drm_writeback_signal_completion(&rcrtc->connector.writeback, 0);
>   }

-- 
Louis Chauvet, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [RFC PATCH 7/8] drm/rcar_du: Adapt vkms writeback to new drm_writeback_connector

Posted by Laurent Pinchart 6 months ago

On Mon, Aug 11, 2025 at 02:57:06PM +0530, Suraj Kandpal wrote:
> Now that drm_writeback_connector is embedded with the drm_connector
> adapt the rcar-du writeback functionality to this changes. This
> includes changing the drm_writeback_connector to be changed to drm_connector
> within the rcar_du_crtc.
> Some other changes are done which are a result of the all the above
> changes mentioned.
> 
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
>  .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h    |  4 ++--
>  .../drm/renesas/rcar-du/rcar_du_writeback.c   | 22 +++++++++++--------
>  2 files changed, 15 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> index d0f38a8b3561..457c803d75bc 100644
> --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> @@ -72,11 +72,11 @@ struct rcar_du_crtc {
>  	const char *const *sources;
>  	unsigned int sources_count;
>  
> -	struct drm_writeback_connector writeback;
> +	struct drm_connector connector;

You forgot to update the documentation of the structure.

"connector" is a too generic name. I'd keep the existing field name.

>  };
>  
>  #define to_rcar_crtc(c)		container_of(c, struct rcar_du_crtc, crtc)
> -#define wb_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, writeback)
> +#define connector_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, connector)
>  
>  /**
>   * struct rcar_du_crtc_state - Driver-specific CRTC state
> 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 9986a10e8114..95e6810612c2 100644
> --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> @@ -47,10 +47,12 @@ static int rcar_du_wb_conn_get_modes(struct drm_connector *connector)
>  				    dev->mode_config.max_height);
>  }
>  
> -static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
> +static int rcar_du_wb_prepare_job(struct drm_writeback_connector *wb_connector,
>  				  struct drm_writeback_job *job)
>  {
> -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> +	struct drm_connector *connector =
> +		container_of(wb_connector, struct drm_connector, writeback);
> +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);

Modify wb_to_rcar_crtc() instead of changing the code here and below.

>  	struct rcar_du_wb_job *rjob;
>  	int ret;
>  
> @@ -72,10 +74,12 @@ static int rcar_du_wb_prepare_job(struct drm_writeback_connector *connector,
>  	return 0;
>  }
>  
> -static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *connector,
> +static void rcar_du_wb_cleanup_job(struct drm_writeback_connector *wb_connector,
>  				   struct drm_writeback_job *job)
>  {
> -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> +	struct drm_connector *connector =
> +		container_of(wb_connector, struct drm_connector, writeback);
> +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
>  	struct rcar_du_wb_job *rjob = job->priv;
>  
>  	if (!job->fb)
> @@ -199,7 +203,7 @@ static const u32 writeback_formats[] = {
>  int rcar_du_writeback_init(struct rcar_du_device *rcdu,
>  			   struct rcar_du_crtc *rcrtc)
>  {
> -	struct drm_writeback_connector *wb_conn = &rcrtc->writeback;
> +	struct drm_writeback_connector *wb_conn = &rcrtc->connector.writeback;
>  
>  	struct drm_encoder *encoder;
>  
> @@ -212,7 +216,7 @@ int rcar_du_writeback_init(struct rcar_du_device *rcdu,
>  
>  	encoder->possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
>  
> -	drm_connector_helper_add(&wb_conn->base,
> +	drm_connector_helper_add(&rcrtc->connector,
>  				 &rcar_du_wb_conn_helper_funcs);
>  
>  	return drmm_writeback_connector_init(&rcdu->ddev, wb_conn,
> @@ -231,7 +235,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
>  	struct drm_framebuffer *fb;
>  	unsigned int i;
>  
> -	state = rcrtc->writeback.base.state;
> +	state = rcrtc->connector.state;
>  	if (!state || !state->writeback_job)
>  		return;
>  
> @@ -246,10 +250,10 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
>  		cfg->mem[i] = sg_dma_address(rjob->sg_tables[i].sgl)
>  			    + fb->offsets[i];
>  
> -	drm_writeback_queue_job(&rcrtc->writeback, state);
> +	drm_writeback_queue_job(&rcrtc->connector.writeback, state);
>  }
>  
>  void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc)
>  {
> -	drm_writeback_signal_completion(&rcrtc->writeback, 0);
> +	drm_writeback_signal_completion(&rcrtc->connector.writeback, 0);
>  }

-- 
Regards,

Laurent Pinchart

RE: [RFC PATCH 7/8] drm/rcar_du: Adapt vkms writeback to new drm_writeback_connector

Posted by Kandpal, Suraj 6 months ago

> > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> > ---
> >  .../gpu/drm/renesas/rcar-du/rcar_du_crtc.h    |  4 ++--
> >  .../drm/renesas/rcar-du/rcar_du_writeback.c   | 22 +++++++++++--------
> >  2 files changed, 15 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> > b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> > index d0f38a8b3561..457c803d75bc 100644
> > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h
> > @@ -72,11 +72,11 @@ struct rcar_du_crtc {
> >  	const char *const *sources;
> >  	unsigned int sources_count;
> >
> > -	struct drm_writeback_connector writeback;
> > +	struct drm_connector connector;
> 
> You forgot to update the documentation of the structure.
> 
> "connector" is a too generic name. I'd keep the existing field name.
> 

Sure will leave the name as writeback 

> >  };
> >
> >  #define to_rcar_crtc(c)		container_of(c, struct rcar_du_crtc,
> crtc)
> > -#define wb_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, writeback)
> > +#define connector_to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc,
> connector)
> >
> >  /**
> >   * struct rcar_du_crtc_state - Driver-specific CRTC state 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 9986a10e8114..95e6810612c2 100644
> > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_writeback.c
> > @@ -47,10 +47,12 @@ static int rcar_du_wb_conn_get_modes(struct
> drm_connector *connector)
> >  				    dev->mode_config.max_height);  }
> >
> > -static int rcar_du_wb_prepare_job(struct drm_writeback_connector
> > *connector,
> > +static int rcar_du_wb_prepare_job(struct drm_writeback_connector
> > +*wb_connector,
> >  				  struct drm_writeback_job *job)
> >  {
> > -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> > +	struct drm_connector *connector =
> > +		container_of(wb_connector, struct drm_connector, writeback);
> > +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
> 
> Modify wb_to_rcar_crtc() instead of changing the code here and below.
> 

Sure will modify that when I send this as a real series once I get the Ack for this design.

Regards,
Suraj Kandpal

> >  	struct rcar_du_wb_job *rjob;
> >  	int ret;
> >
> > @@ -72,10 +74,12 @@ static int rcar_du_wb_prepare_job(struct
> drm_writeback_connector *connector,
> >  	return 0;
> >  }
> >
> > -static void rcar_du_wb_cleanup_job(struct drm_writeback_connector
> > *connector,
> > +static void rcar_du_wb_cleanup_job(struct drm_writeback_connector
> > +*wb_connector,
> >  				   struct drm_writeback_job *job)  {
> > -	struct rcar_du_crtc *rcrtc = wb_to_rcar_crtc(connector);
> > +	struct drm_connector *connector =
> > +		container_of(wb_connector, struct drm_connector, writeback);
> > +	struct rcar_du_crtc *rcrtc = connector_to_rcar_crtc(connector);
> >  	struct rcar_du_wb_job *rjob = job->priv;
> >
> >  	if (!job->fb)
> > @@ -199,7 +203,7 @@ static const u32 writeback_formats[] = {  int
> > rcar_du_writeback_init(struct rcar_du_device *rcdu,
> >  			   struct rcar_du_crtc *rcrtc)
> >  {
> > -	struct drm_writeback_connector *wb_conn = &rcrtc->writeback;
> > +	struct drm_writeback_connector *wb_conn =
> > +&rcrtc->connector.writeback;
> >
> >  	struct drm_encoder *encoder;
> >
> > @@ -212,7 +216,7 @@ int rcar_du_writeback_init(struct rcar_du_device
> > *rcdu,
> >
> >  	encoder->possible_crtcs = 1 << drm_crtc_index(&rcrtc->crtc);
> >
> > -	drm_connector_helper_add(&wb_conn->base,
> > +	drm_connector_helper_add(&rcrtc->connector,
> >  				 &rcar_du_wb_conn_helper_funcs);
> >
> >  	return drmm_writeback_connector_init(&rcdu->ddev, wb_conn, @@ -
> 231,7
> > +235,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc,
> >  	struct drm_framebuffer *fb;
> >  	unsigned int i;
> >
> > -	state = rcrtc->writeback.base.state;
> > +	state = rcrtc->connector.state;
> >  	if (!state || !state->writeback_job)
> >  		return;
> >
> > @@ -246,10 +250,10 @@ void rcar_du_writeback_setup(struct rcar_du_crtc
> *rcrtc,
> >  		cfg->mem[i] = sg_dma_address(rjob->sg_tables[i].sgl)
> >  			    + fb->offsets[i];
> >
> > -	drm_writeback_queue_job(&rcrtc->writeback, state);
> > +	drm_writeback_queue_job(&rcrtc->connector.writeback, state);
> >  }
> >
> >  void rcar_du_writeback_complete(struct rcar_du_crtc *rcrtc)  {
> > -	drm_writeback_signal_completion(&rcrtc->writeback, 0);
> > +	drm_writeback_signal_completion(&rcrtc->connector.writeback, 0);
> >  }
> 
> --
> Regards,
> 
> Laurent Pinchart