[PATCH RFC 0/4] drm/vkms: Switch all vkms object to DRM managed objects

[PATCH RFC 0/4] drm/vkms: Switch all vkms object to DRM managed objects

[Louis Chauvet]

To simplify the memory managment this series replace all allocation by 
drm-managed one. This way the VKMS code don't have to manage it directly 
and the DRM core will handle the object destruction.

This series depends on [1].

[1]: https://lore.kernel.org/all/20240814-google-split-headers-v1-0-51712f088f5d@bootlin.com/

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
Louis Chauvet (4):
      drm/vkms: Switch to managed for connector
      drm/vkms: Switch to managed for encoder
      drm/vkms: Switch to managed for crtc
      drm/vkms: Rename all vkms_crtc instance to be consistent

 drivers/gpu/drm/vkms/vkms_composer.c  |  30 ++++----
 drivers/gpu/drm/vkms/vkms_composer.h  |   2 +-
 drivers/gpu/drm/vkms/vkms_crtc.c      | 111 ++++++++++++++++-----------
 drivers/gpu/drm/vkms/vkms_crtc.h      |  19 +++--
 drivers/gpu/drm/vkms/vkms_drv.c       | 134 +++++++++++++++++++++++++++++---
 drivers/gpu/drm/vkms/vkms_drv.h       |  45 -----------
 drivers/gpu/drm/vkms/vkms_output.c    | 140 ----------------------------------
 drivers/gpu/drm/vkms/vkms_writeback.c |  28 ++++---
 drivers/gpu/drm/vkms/vkms_writeback.h |   2 +-
 9 files changed, 229 insertions(+), 282 deletions(-)
---
base-commit: 219b45d023ed0902b05c5902a4f31c2c38bcf68c
change-id: 20240521-google-vkms-managed-4aec99461a77
prerequisite-message-id: <20240809-yuv-v10-0-1a7c764166f7@bootlin.com>
prerequisite-patch-id: ae2d8b2efbbaa9decce56632c498c87e708288b3
prerequisite-patch-id: c26b6d4867eaf6566195aa0002765357d4f69f8c
prerequisite-patch-id: 8791d34a6f3148dc518da5249453067e40d346e3
prerequisite-patch-id: 26ec7cd5a449004bcfd6ce483671f87655f8635c
prerequisite-patch-id: 2e855ba871f2e99d4b6b7d85da2ddac6bb32262e
prerequisite-patch-id: 82523a917646793deeec7cdcc7ff286bd924fd21
prerequisite-patch-id: 0e355e5316281f53ab5e97ab6e63b0a682f3eb9e
prerequisite-patch-id: 7a63d245a377d5f5283f48e8f52421b912811752
prerequisite-patch-id: dda6bf4692cd1795c489ff58e72c0841ea8ffbc4
prerequisite-patch-id: f70e535b6086cc587975fbfa75741f485f679a32
prerequisite-patch-id: 6c2aa2645c7d854951608aa4d15a02e076abe1fe
prerequisite-patch-id: dc61c6d3db73053fc36e115af561e0c42b467de2
prerequisite-patch-id: deda292af6d8bbf6762b0bf4d351ffd2225995d8
prerequisite-patch-id: 18554f49b53cbcfd4a8ca50dc83b17dd3cf96474
prerequisite-patch-id: 5633292e10132d29be2467812e6e2e824cfedb67
prerequisite-patch-id: 43f37e9c1bc041d491e41dfb59548ed258a1e071
prerequisite-message-id: <20240814-b4-new-color-formats-v2-0-8b3499cfe90e@bootlin.com>
prerequisite-patch-id: d10db4cb12a88de2e5f6440e9fcf5ddda191e3cd
prerequisite-patch-id: 16bac0ef1f1dc010a72ce2faae66631797d23d3f
prerequisite-patch-id: 8e0e5cc0727e8fd2d14ebafc5538fd987c2dd38e
prerequisite-patch-id: 32bad3bf3df46d042e9edd4c1259c2e2a3fb8975
prerequisite-patch-id: 4bd9e4cef308abd17b7b274a5575a3de73a1503b
prerequisite-patch-id: a98fac5a2c60fe23fbc6a455e9a4ab8b0f187ee8
prerequisite-patch-id: 62c8d109a22b9978f755255b67f13fe74fb7008d
prerequisite-patch-id: baa8da4871dd90b03a07c6d9ddb45e10929ee70a
prerequisite-message-id: <20240814-writeback_line_by_line-v2-0-36541c717569@bootlin.com>
prerequisite-patch-id: df699289213021fa202fcdf1b4bdff513d09caa2
prerequisite-patch-id: 59d021ccb166fbe2962de9cda72aceb3caa9cabe
prerequisite-patch-id: 895ace6d58b3776798791705b7b05e26b8d37c7b
prerequisite-message-id: <20240814-google-clarifications-v1-0-3ee76d7d0c28@bootlin.com>
prerequisite-patch-id: a4408d1de7730262456bdd618d3cb86f5f5b01ba
prerequisite-patch-id: f215b5aee5644d2e5b1b2af0bb0f4f1e7609558b
prerequisite-patch-id: d4f3b4c714324c5f326af3daba394899e6663d75
prerequisite-message-id: <20240814-google-split-headers-v1-0-51712f088f5d@bootlin.com>
prerequisite-patch-id: 55e5c2ded8332cd6600d9c0c2b7be657c793e2a0
prerequisite-patch-id: 88323ab9ea04fb21a0a4c65642bcd499f2354042
prerequisite-patch-id: 437b67cf9bdc036fa7c5e11b5c9ab387b10cc151
prerequisite-patch-id: d34801b7f3035ab15facd42281c1c96e61d35a4c
prerequisite-patch-id: 37862a6437ff407a42e5aaff0b8e742fc9901e03
prerequisite-patch-id: 43a5079497a1579aef713ea9c4ec47ef53a177a2

Best regards,
-- 
Louis Chauvet <louis.chauvet@bootlin.com>

[PATCH RFC 1/4] drm/vkms: Switch to managed for connector

[Louis Chauvet]

The current VKMS driver uses non-managed function to create connectors. It
is not an issue yet, but in order to support multiple devices easily,
convert this code to use drm and device managed helpers.

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
 drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
 drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index f74a5c2045f9..cea7b2640c5d 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -43,7 +43,6 @@
 struct vkms_output {
 	struct drm_crtc crtc;
 	struct drm_encoder encoder;
-	struct drm_connector connector;
 	struct drm_writeback_connector wb_connector;
 	struct hrtimer vblank_hrtimer;
 	ktime_t period_ns;
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 20073a00b200..4767838c3a73 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -3,6 +3,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
+#include <drm/drm_managed.h>
 
 #include "vkms_writeback.h"
 #include "vkms_plane.h"
@@ -10,7 +11,6 @@
 
 static const struct drm_connector_funcs vkms_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
-	.destroy = drm_connector_cleanup,
 	.reset = drm_atomic_helper_connector_reset,
 	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -54,7 +54,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 {
 	struct vkms_output *output = &vkmsdev->output;
 	struct drm_device *dev = &vkmsdev->drm;
-	struct drm_connector *connector = &output->connector;
+	struct drm_connector *connector;
 	struct drm_encoder *encoder = &output->encoder;
 	struct drm_crtc *crtc = &output->crtc;
 	struct vkms_plane *primary, *cursor = NULL;
@@ -90,11 +90,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 	if (ret)
 		return ret;
 
-	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
-				 DRM_MODE_CONNECTOR_VIRTUAL);
+	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
+	if (!connector)
+		return -ENOMEM;
+
+	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
+				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to init connector\n");
-		goto err_connector;
+		return ret;
 	}
 
 	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
@@ -103,7 +107,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 			       DRM_MODE_ENCODER_VIRTUAL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to init encoder\n");
-		goto err_encoder;
+		return ret;
 	}
 	/*
 	 * This is an hardcoded value to select crtc for the encoder.
@@ -130,11 +134,5 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 err_attach:
 	drm_encoder_cleanup(encoder);
 
-err_encoder:
-	drm_connector_cleanup(connector);
-
-err_connector:
-	drm_crtc_cleanup(crtc);
-
 	return ret;
 }

-- 
2.44.2

[PATCH RFC 1/4] drm/vkms: Switch to managed for connector

[José Expósito]

Hi Louis,

Thanks for these patches. Easy review as my configfs series included similar
patches :) I think that this series could be easily rebased on drm-misc-next,
but I don't know if that'd add a lot of work rebasing other series. I'd be nice
to get these 4 merged.

> The current VKMS driver uses non-managed function to create connectors. It
> is not an issue yet, but in order to support multiple devices easily,
> convert this code to use drm and device managed helpers.
> 
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>

Reviewed-by: José Expósito <jose.exposito89@gmail.com>

> ---
>  drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
>  drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++------------
>  2 files changed, 10 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> index f74a5c2045f9..cea7b2640c5d 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.h
> +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> @@ -43,7 +43,6 @@
>  struct vkms_output {
>  	struct drm_crtc crtc;
>  	struct drm_encoder encoder;
> -	struct drm_connector connector;
>  	struct drm_writeback_connector wb_connector;
>  	struct hrtimer vblank_hrtimer;
>  	ktime_t period_ns;
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 20073a00b200..4767838c3a73 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -3,6 +3,7 @@
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_edid.h>
>  #include <drm/drm_probe_helper.h>
> +#include <drm/drm_managed.h>

Nit: Keep includes sorted alphabetically if possible

>  
>  #include "vkms_writeback.h"
>  #include "vkms_plane.h"
> @@ -10,7 +11,6 @@
>  
>  static const struct drm_connector_funcs vkms_connector_funcs = {
>  	.fill_modes = drm_helper_probe_single_connector_modes,
> -	.destroy = drm_connector_cleanup,
>  	.reset = drm_atomic_helper_connector_reset,
>  	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
>  	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> @@ -54,7 +54,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  {
>  	struct vkms_output *output = &vkmsdev->output;
>  	struct drm_device *dev = &vkmsdev->drm;
> -	struct drm_connector *connector = &output->connector;
> +	struct drm_connector *connector;
>  	struct drm_encoder *encoder = &output->encoder;
>  	struct drm_crtc *crtc = &output->crtc;
>  	struct vkms_plane *primary, *cursor = NULL;
> @@ -90,11 +90,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  	if (ret)
>  		return ret;
>  
> -	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
> -				 DRM_MODE_CONNECTOR_VIRTUAL);
> +	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);

"&vkmsdev->drm" can be replaced with "dev".

> +	if (!connector)

For consistency with the init function, it'd be nice to log this error as well:

		DRM_ERROR("Failed to allocate connector\n");

> +		return -ENOMEM;
> +
> +	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> +				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
>  	if (ret) {
>  		DRM_ERROR("Failed to init connector\n");
> -		goto err_connector;
> +		return ret;
>  	}
>  
>  	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> @@ -103,7 +107,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  			       DRM_MODE_ENCODER_VIRTUAL, NULL);
>  	if (ret) {
>  		DRM_ERROR("Failed to init encoder\n");
> -		goto err_encoder;
> +		return ret;
>  	}
>  	/*
>  	 * This is an hardcoded value to select crtc for the encoder.
> @@ -130,11 +134,5 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  err_attach:
>  	drm_encoder_cleanup(encoder);
>  
> -err_encoder:
> -	drm_connector_cleanup(connector);
> -
> -err_connector:
> -	drm_crtc_cleanup(crtc);
> -

I think that, technically, err_encoder should call drm_crtc_cleanup() in this
patch. However, since a future patch will remove this code I don't find it that
relevant.

>  	return ret;
>  }

Re: [PATCH RFC 1/4] drm/vkms: Switch to managed for connector

[Maíra Canal]

Hi Louis,

On 8/20/24 06:09, José Expósito wrote:
> Hi Louis,
> 
> Thanks for these patches. Easy review as my configfs series included similar
> patches :) I think that this series could be easily rebased on drm-misc-next,
> but I don't know if that'd add a lot of work rebasing other series. I'd be nice
> to get these 4 merged.
> 

I'm with José on this one. If you rebase it on top of drm-misc-next, I 
can review faster and merge this patches right away.

Best Regards,
- Maíra

>> The current VKMS driver uses non-managed function to create connectors. It
>> is not an issue yet, but in order to support multiple devices easily,
>> convert this code to use drm and device managed helpers.
>>
>> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> 
> Reviewed-by: José Expósito <jose.exposito89@gmail.com>
> 
>> ---
>>   drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
>>   drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++------------
>>   2 files changed, 10 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
>> index f74a5c2045f9..cea7b2640c5d 100644
>> --- a/drivers/gpu/drm/vkms/vkms_drv.h
>> +++ b/drivers/gpu/drm/vkms/vkms_drv.h
>> @@ -43,7 +43,6 @@
>>   struct vkms_output {
>>   	struct drm_crtc crtc;
>>   	struct drm_encoder encoder;
>> -	struct drm_connector connector;
>>   	struct drm_writeback_connector wb_connector;
>>   	struct hrtimer vblank_hrtimer;
>>   	ktime_t period_ns;
>> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
>> index 20073a00b200..4767838c3a73 100644
>> --- a/drivers/gpu/drm/vkms/vkms_output.c
>> +++ b/drivers/gpu/drm/vkms/vkms_output.c
>> @@ -3,6 +3,7 @@
>>   #include <drm/drm_atomic_helper.h>
>>   #include <drm/drm_edid.h>
>>   #include <drm/drm_probe_helper.h>
>> +#include <drm/drm_managed.h>
> 
> Nit: Keep includes sorted alphabetically if possible
> 
>>   
>>   #include "vkms_writeback.h"
>>   #include "vkms_plane.h"
>> @@ -10,7 +11,6 @@
>>   
>>   static const struct drm_connector_funcs vkms_connector_funcs = {
>>   	.fill_modes = drm_helper_probe_single_connector_modes,
>> -	.destroy = drm_connector_cleanup,
>>   	.reset = drm_atomic_helper_connector_reset,
>>   	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
>>   	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
>> @@ -54,7 +54,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>>   {
>>   	struct vkms_output *output = &vkmsdev->output;
>>   	struct drm_device *dev = &vkmsdev->drm;
>> -	struct drm_connector *connector = &output->connector;
>> +	struct drm_connector *connector;
>>   	struct drm_encoder *encoder = &output->encoder;
>>   	struct drm_crtc *crtc = &output->crtc;
>>   	struct vkms_plane *primary, *cursor = NULL;
>> @@ -90,11 +90,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>>   	if (ret)
>>   		return ret;
>>   
>> -	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
>> -				 DRM_MODE_CONNECTOR_VIRTUAL);
>> +	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> 
> "&vkmsdev->drm" can be replaced with "dev".
> 
>> +	if (!connector)
> 
> For consistency with the init function, it'd be nice to log this error as well:
> 
> 		DRM_ERROR("Failed to allocate connector\n");
> 
>> +		return -ENOMEM;
>> +
>> +	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
>> +				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
>>   	if (ret) {
>>   		DRM_ERROR("Failed to init connector\n");
>> -		goto err_connector;
>> +		return ret;
>>   	}
>>   
>>   	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
>> @@ -103,7 +107,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>>   			       DRM_MODE_ENCODER_VIRTUAL, NULL);
>>   	if (ret) {
>>   		DRM_ERROR("Failed to init encoder\n");
>> -		goto err_encoder;
>> +		return ret;
>>   	}
>>   	/*
>>   	 * This is an hardcoded value to select crtc for the encoder.
>> @@ -130,11 +134,5 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>>   err_attach:
>>   	drm_encoder_cleanup(encoder);
>>   
>> -err_encoder:
>> -	drm_connector_cleanup(connector);
>> -
>> -err_connector:
>> -	drm_crtc_cleanup(crtc);
>> -
> 
> I think that, technically, err_encoder should call drm_crtc_cleanup() in this
> patch. However, since a future patch will remove this code I don't find it that
> relevant.
> 
>>   	return ret;
>>   }

Re: [PATCH RFC 1/4] drm/vkms: Switch to managed for connector

[Louis Chauvet]

Le 20/08/24 - 11:09, José Expósito a écrit :
> Hi Louis,
> 
> Thanks for these patches. Easy review as my configfs series included similar
> patches :) I think that this series could be easily rebased on drm-misc-next,
> but I don't know if that'd add a lot of work rebasing other series. I'd be nice
> to get these 4 merged.

It is not trivial to rebase before the split-header series. I will see if 
I can rebase this+split header easly, but I fear few conflicts.
 
> > The current VKMS driver uses non-managed function to create connectors. It
> > is not an issue yet, but in order to support multiple devices easily,
> > convert this code to use drm and device managed helpers.
> > 
> > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> 
> Reviewed-by: José Expósito <jose.exposito89@gmail.com>

Thanks! I will test my v2 and send it tomorrow!

> > ---
> >  drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
> >  drivers/gpu/drm/vkms/vkms_output.c | 22 ++++++++++------------
> >  2 files changed, 10 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> > index f74a5c2045f9..cea7b2640c5d 100644
> > --- a/drivers/gpu/drm/vkms/vkms_drv.h
> > +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> > @@ -43,7 +43,6 @@
> >  struct vkms_output {
> >  	struct drm_crtc crtc;
> >  	struct drm_encoder encoder;
> > -	struct drm_connector connector;
> >  	struct drm_writeback_connector wb_connector;
> >  	struct hrtimer vblank_hrtimer;
> >  	ktime_t period_ns;
> > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> > index 20073a00b200..4767838c3a73 100644
> > --- a/drivers/gpu/drm/vkms/vkms_output.c
> > +++ b/drivers/gpu/drm/vkms/vkms_output.c
> > @@ -3,6 +3,7 @@
> >  #include <drm/drm_atomic_helper.h>
> >  #include <drm/drm_edid.h>
> >  #include <drm/drm_probe_helper.h>
> > +#include <drm/drm_managed.h>
> 
> Nit: Keep includes sorted alphabetically if possible
> 
> >  
> >  #include "vkms_writeback.h"
> >  #include "vkms_plane.h"
> > @@ -10,7 +11,6 @@
> >  
> >  static const struct drm_connector_funcs vkms_connector_funcs = {
> >  	.fill_modes = drm_helper_probe_single_connector_modes,
> > -	.destroy = drm_connector_cleanup,
> >  	.reset = drm_atomic_helper_connector_reset,
> >  	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> >  	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > @@ -54,7 +54,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  {
> >  	struct vkms_output *output = &vkmsdev->output;
> >  	struct drm_device *dev = &vkmsdev->drm;
> > -	struct drm_connector *connector = &output->connector;
> > +	struct drm_connector *connector;
> >  	struct drm_encoder *encoder = &output->encoder;
> >  	struct drm_crtc *crtc = &output->crtc;
> >  	struct vkms_plane *primary, *cursor = NULL;
> > @@ -90,11 +90,15 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  	if (ret)
> >  		return ret;
> >  
> > -	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
> > -				 DRM_MODE_CONNECTOR_VIRTUAL);
> > +	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> 
> "&vkmsdev->drm" can be replaced with "dev".
> 
> > +	if (!connector)
> 
> For consistency with the init function, it'd be nice to log this error as well:
> 
> 		DRM_ERROR("Failed to allocate connector\n");
> 
> > +		return -ENOMEM;
> > +
> > +	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> > +				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
> >  	if (ret) {
> >  		DRM_ERROR("Failed to init connector\n");
> > -		goto err_connector;
> > +		return ret;
> >  	}
> >  
> >  	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> > @@ -103,7 +107,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  			       DRM_MODE_ENCODER_VIRTUAL, NULL);
> >  	if (ret) {
> >  		DRM_ERROR("Failed to init encoder\n");
> > -		goto err_encoder;
> > +		return ret;
> >  	}
> >  	/*
> >  	 * This is an hardcoded value to select crtc for the encoder.
> > @@ -130,11 +134,5 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  err_attach:
> >  	drm_encoder_cleanup(encoder);
> >  
> > -err_encoder:
> > -	drm_connector_cleanup(connector);
> > -
> > -err_connector:
> > -	drm_crtc_cleanup(crtc);
> > -
> 
> I think that, technically, err_encoder should call drm_crtc_cleanup() in this
> patch. However, since a future patch will remove this code I don't find it that
> relevant.

True, I will keep it to avoid issues. I believe it is a remnant of my many 
rebases.

> >  	return ret;
> >  }

[PATCH RFC 2/4] drm/vkms: Switch to managed for encoder

[Louis Chauvet]

The current VKMS driver uses non-managed function to create encoders. It
is not an issue yet, but in order to support multiple devices easly,
convert this code to use drm and device managed helpers.

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
 drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
 drivers/gpu/drm/vkms/vkms_output.c | 21 +++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index cea7b2640c5d..2c9d1f20ce84 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -42,7 +42,6 @@
  */
 struct vkms_output {
 	struct drm_crtc crtc;
-	struct drm_encoder encoder;
 	struct drm_writeback_connector wb_connector;
 	struct hrtimer vblank_hrtimer;
 	ktime_t period_ns;
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 4767838c3a73..cb8507917b5f 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -16,9 +16,7 @@ static const struct drm_connector_funcs vkms_connector_funcs = {
 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
 };
 
-static const struct drm_encoder_funcs vkms_encoder_funcs = {
-	.destroy = drm_encoder_cleanup,
-};
+static const struct drm_encoder_funcs vkms_encoder_funcs = {};
 
 static int vkms_conn_get_modes(struct drm_connector *connector)
 {
@@ -55,7 +53,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 	struct vkms_output *output = &vkmsdev->output;
 	struct drm_device *dev = &vkmsdev->drm;
 	struct drm_connector *connector;
-	struct drm_encoder *encoder = &output->encoder;
+	struct drm_encoder *encoder;
 	struct drm_crtc *crtc = &output->crtc;
 	struct vkms_plane *primary, *cursor = NULL;
 	int ret;
@@ -103,8 +101,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 
 	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
 
-	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
-			       DRM_MODE_ENCODER_VIRTUAL, NULL);
+	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
+	if (!encoder)
+		return -ENOMEM;
+
+	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
+				DRM_MODE_ENCODER_VIRTUAL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to init encoder\n");
 		return ret;
@@ -118,7 +120,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 	ret = drm_connector_attach_encoder(connector, encoder);
 	if (ret) {
 		DRM_ERROR("Failed to attach connector to encoder\n");
-		goto err_attach;
+		return ret;
 	}
 
 	if (vkmsdev->config->writeback) {
@@ -130,9 +132,4 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
 	drm_mode_config_reset(dev);
 
 	return 0;
-
-err_attach:
-	drm_encoder_cleanup(encoder);
-
-	return ret;
 }

-- 
2.44.2

[PATCH RFC 2/4] drm/vkms: Switch to managed for encoder

[José Expósito]

> The current VKMS driver uses non-managed function to create encoders. It
> is not an issue yet, but in order to support multiple devices easly,

s/easly/easily

> convert this code to use drm and device managed helpers.
> 
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>

Reviewed-by: José Expósito <jose.exposito89@gmail.com>

> ---
>  drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
>  drivers/gpu/drm/vkms/vkms_output.c | 21 +++++++++------------
>  2 files changed, 9 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> index cea7b2640c5d..2c9d1f20ce84 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.h
> +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> @@ -42,7 +42,6 @@
>   */
>  struct vkms_output {
>  	struct drm_crtc crtc;
> -	struct drm_encoder encoder;
>  	struct drm_writeback_connector wb_connector;
>  	struct hrtimer vblank_hrtimer;
>  	ktime_t period_ns;
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 4767838c3a73..cb8507917b5f 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -16,9 +16,7 @@ static const struct drm_connector_funcs vkms_connector_funcs = {
>  	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
>  };
>  
> -static const struct drm_encoder_funcs vkms_encoder_funcs = {
> -	.destroy = drm_encoder_cleanup,
> -};
> +static const struct drm_encoder_funcs vkms_encoder_funcs = {};

This struct is not required, drmm_encoder_init() can take a NULL value.

>  
>  static int vkms_conn_get_modes(struct drm_connector *connector)
>  {
> @@ -55,7 +53,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  	struct vkms_output *output = &vkmsdev->output;
>  	struct drm_device *dev = &vkmsdev->drm;
>  	struct drm_connector *connector;
> -	struct drm_encoder *encoder = &output->encoder;
> +	struct drm_encoder *encoder;
>  	struct drm_crtc *crtc = &output->crtc;
>  	struct vkms_plane *primary, *cursor = NULL;
>  	int ret;
> @@ -103,8 +101,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  
>  	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
>  
> -	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> -			       DRM_MODE_ENCODER_VIRTUAL, NULL);
> +	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);

&vkmsdev->drm => dev

> +	if (!encoder)

The same here, we could log this error:
		DRM_ERROR("Failed to allocate encoder\n");

> +		return -ENOMEM;
> +
> +	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,

vkms_encoder_funcs can be NULL.

> +				DRM_MODE_ENCODER_VIRTUAL, NULL);
>  	if (ret) {
>  		DRM_ERROR("Failed to init encoder\n");
>  		return ret;
> @@ -118,7 +120,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  	ret = drm_connector_attach_encoder(connector, encoder);
>  	if (ret) {
>  		DRM_ERROR("Failed to attach connector to encoder\n");
> -		goto err_attach;
> +		return ret;
>  	}
>  
>  	if (vkmsdev->config->writeback) {
> @@ -130,9 +132,4 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
>  	drm_mode_config_reset(dev);
>  
>  	return 0;
> -
> -err_attach:
> -	drm_encoder_cleanup(encoder);
> -
> -	return ret;
>  }

Re: [PATCH RFC 2/4] drm/vkms: Switch to managed for encoder

[Louis Chauvet]

Le 20/08/24 - 11:09, José Expósito a écrit :
> > The current VKMS driver uses non-managed function to create encoders. It
> > is not an issue yet, but in order to support multiple devices easly,
> 
> s/easly/easily
> 
> > convert this code to use drm and device managed helpers.
> > 
> > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> 
> Reviewed-by: José Expósito <jose.exposito89@gmail.com>

Thanks!
 
> > ---
> >  drivers/gpu/drm/vkms/vkms_drv.h    |  1 -
> >  drivers/gpu/drm/vkms/vkms_output.c | 21 +++++++++------------
> >  2 files changed, 9 insertions(+), 13 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> > index cea7b2640c5d..2c9d1f20ce84 100644
> > --- a/drivers/gpu/drm/vkms/vkms_drv.h
> > +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> > @@ -42,7 +42,6 @@
> >   */
> >  struct vkms_output {
> >  	struct drm_crtc crtc;
> > -	struct drm_encoder encoder;
> >  	struct drm_writeback_connector wb_connector;
> >  	struct hrtimer vblank_hrtimer;
> >  	ktime_t period_ns;
> > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> > index 4767838c3a73..cb8507917b5f 100644
> > --- a/drivers/gpu/drm/vkms/vkms_output.c
> > +++ b/drivers/gpu/drm/vkms/vkms_output.c
> > @@ -16,9 +16,7 @@ static const struct drm_connector_funcs vkms_connector_funcs = {
> >  	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> >  };
> >  
> > -static const struct drm_encoder_funcs vkms_encoder_funcs = {
> > -	.destroy = drm_encoder_cleanup,
> > -};
> > +static const struct drm_encoder_funcs vkms_encoder_funcs = {};
> 
> This struct is not required, drmm_encoder_init() can take a NULL value.
> 
> >  
> >  static int vkms_conn_get_modes(struct drm_connector *connector)
> >  {
> > @@ -55,7 +53,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  	struct vkms_output *output = &vkmsdev->output;
> >  	struct drm_device *dev = &vkmsdev->drm;
> >  	struct drm_connector *connector;
> > -	struct drm_encoder *encoder = &output->encoder;
> > +	struct drm_encoder *encoder;
> >  	struct drm_crtc *crtc = &output->crtc;
> >  	struct vkms_plane *primary, *cursor = NULL;
> >  	int ret;
> > @@ -103,8 +101,12 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  
> >  	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> >  
> > -	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> > -			       DRM_MODE_ENCODER_VIRTUAL, NULL);
> > +	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
> 
> &vkmsdev->drm => dev
> 
> > +	if (!encoder)
> 
> The same here, we could log this error:
> 		DRM_ERROR("Failed to allocate encoder\n");
> 
> > +		return -ENOMEM;
> > +
> > +	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> 
> vkms_encoder_funcs can be NULL.
> 
> > +				DRM_MODE_ENCODER_VIRTUAL, NULL);
> >  	if (ret) {
> >  		DRM_ERROR("Failed to init encoder\n");
> >  		return ret;
> > @@ -118,7 +120,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  	ret = drm_connector_attach_encoder(connector, encoder);
> >  	if (ret) {
> >  		DRM_ERROR("Failed to attach connector to encoder\n");
> > -		goto err_attach;
> > +		return ret;
> >  	}
> >  
> >  	if (vkmsdev->config->writeback) {
> > @@ -130,9 +132,4 @@ int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> >  	drm_mode_config_reset(dev);
> >  
> >  	return 0;
> > -
> > -err_attach:
> > -	drm_encoder_cleanup(encoder);
> > -
> > -	return ret;
> >  }

[PATCH RFC 3/4] drm/vkms: Switch to managed for crtc

[Louis Chauvet]

The current VKMS driver uses non-managed function to create crtcs. It
is not an issue yet, but in order to support multiple devices easly,
convert this code to use drm and device managed helpers.

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
 drivers/gpu/drm/vkms/vkms_composer.c  |  10 +--
 drivers/gpu/drm/vkms/vkms_composer.h  |   2 +-
 drivers/gpu/drm/vkms/vkms_crtc.c      |  75 ++++++++++++-------
 drivers/gpu/drm/vkms/vkms_crtc.h      |  19 +++--
 drivers/gpu/drm/vkms/vkms_drv.c       | 134 ++++++++++++++++++++++++++++++---
 drivers/gpu/drm/vkms/vkms_drv.h       |  43 -----------
 drivers/gpu/drm/vkms/vkms_output.c    | 135 ----------------------------------
 drivers/gpu/drm/vkms/vkms_writeback.c |  20 +++--
 drivers/gpu/drm/vkms/vkms_writeback.h |   2 +-
 9 files changed, 197 insertions(+), 243 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 15ef07ed304e..9b2f578c2eb1 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -515,7 +515,7 @@ void vkms_composer_worker(struct work_struct *work)
 							  composer_work);
 	struct drm_crtc *crtc = crtc_state->base.crtc;
 	struct vkms_writeback_job *active_wb = crtc_state->active_writeback;
-	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
 	bool crc_pending, wb_pending;
 	u64 frame_start, frame_end;
 	u32 crc32 = 0;
@@ -616,12 +616,12 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
 	return 0;
 }
 
-void vkms_set_composer(struct vkms_output *out, bool enabled)
+void vkms_set_composer(struct vkms_crtc *out, bool enabled)
 {
 	bool old_enabled;
 
 	if (enabled)
-		drm_crtc_vblank_get(&out->crtc);
+		drm_crtc_vblank_get(&out->base);
 
 	spin_lock_irq(&out->lock);
 	old_enabled = out->composer_enabled;
@@ -629,12 +629,12 @@ void vkms_set_composer(struct vkms_output *out, bool enabled)
 	spin_unlock_irq(&out->lock);
 
 	if (old_enabled)
-		drm_crtc_vblank_put(&out->crtc);
+		drm_crtc_vblank_put(&out->base);
 }
 
 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
 {
-	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
 	bool enabled = false;
 	int ret = 0;
 
diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
index 91b33af1e013..77efd2e3a63a 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.h
+++ b/drivers/gpu/drm/vkms/vkms_composer.h
@@ -7,7 +7,7 @@
 #include "vkms_crtc.h"
 
 void vkms_composer_worker(struct work_struct *work);
-void vkms_set_composer(struct vkms_output *out, bool enabled);
+void vkms_set_composer(struct vkms_crtc *out, bool enabled);
 
 /* CRC Support */
 const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count);
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index 6fae43932b60..47e62fb3e404 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -6,6 +6,8 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_vblank.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_gem_atomic_helper.h>
 #include <drm/drm_print.h>
 
 #include "vkms_crtc.h"
@@ -14,9 +16,8 @@
 
 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 {
-	struct vkms_output *output = container_of(timer, struct vkms_output,
-						  vblank_hrtimer);
-	struct drm_crtc *crtc = &output->crtc;
+	struct vkms_crtc *output = hrtimer_to_vkms_crtc(timer);
+	struct drm_crtc *crtc = &output->base;
 	struct vkms_crtc_state *state;
 	u64 ret_overrun;
 	bool ret, fence_cookie;
@@ -64,8 +65,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 
 static int vkms_enable_vblank(struct drm_crtc *crtc)
 {
+	struct drm_device *dev = crtc->dev;
 	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
-	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
 
 	drm_calc_timestamping_constants(crtc, &crtc->mode);
 
@@ -79,7 +81,7 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
 
 static void vkms_disable_vblank(struct drm_crtc *crtc)
 {
-	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
 
 	hrtimer_cancel(&out->vblank_hrtimer);
 }
@@ -89,8 +91,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
 				      bool in_vblank_irq)
 {
 	struct drm_device *dev = crtc->dev;
-	struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev);
-	struct vkms_output *output = &vkmsdev->output;
+	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(crtc);
 	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
 
 	if (!READ_ONCE(vblank->enabled)) {
@@ -137,7 +138,7 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc)
 static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc,
 					   struct drm_crtc_state *state)
 {
-	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(state);
+	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(state);
 
 	__drm_atomic_helper_crtc_destroy_state(state);
 
@@ -178,7 +179,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
 {
 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
 									  crtc);
-	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(crtc_state);
+	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(crtc_state);
 	struct drm_plane *plane;
 	struct drm_plane_state *plane_state;
 	int i = 0, ret;
@@ -234,7 +235,7 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
 static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
 				   struct drm_atomic_state *state)
 {
-	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
 
 	/* This lock is held across the atomic commit to block vblank timer
 	 * from scheduling vkms_composer_worker until the composer is updated
@@ -245,7 +246,7 @@ static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
 				   struct drm_atomic_state *state)
 {
-	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
+	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
 
 	if (crtc->state->event) {
 		spin_lock(&crtc->dev->event_lock);
@@ -260,7 +261,7 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
 		crtc->state->event = NULL;
 	}
 
-	vkms_output->composer_state = to_vkms_crtc_state(crtc->state);
+	vkms_output->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
 
 	spin_unlock_irq(&vkms_output->lock);
 }
@@ -273,30 +274,48 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
 	.atomic_disable	= vkms_crtc_atomic_disable,
 };
 
-int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
-		   struct drm_plane *primary, struct drm_plane *cursor)
+static void vkms_crtc_destroy_workqueue(struct drm_device *dev, void *raw_vkms_crtc)
+{
+	struct vkms_crtc *vkms_crtc = raw_vkms_crtc;
+
+	destroy_workqueue(vkms_crtc->composer_workq);
+}
+
+struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
+				 struct drm_plane *primary,
+				 struct drm_plane *cursor)
 {
-	struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc);
+	struct drm_device *dev = &vkmsdev->drm;
+	struct vkms_crtc *vkms_crtc;
 	int ret;
 
-	ret = drmm_crtc_init_with_planes(dev, crtc, primary, cursor,
-					 &vkms_crtc_funcs, NULL);
+	vkms_crtc = drmm_crtc_alloc_with_planes(dev, struct vkms_crtc, base, primary, cursor,
+						&vkms_crtc_funcs, NULL);
+	if (IS_ERR(vkms_crtc)) {
+		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to init CRTC\n");
+		return vkms_crtc;
+	}
+
+	drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs);
+
+	ret = drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE);
 	if (ret) {
-		DRM_ERROR("Failed to init CRTC\n");
-		return ret;
+		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to set gamma size\n");
+		return ERR_PTR(ret);
 	}
 
-	drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
+	drm_crtc_enable_color_mgmt(&vkms_crtc->base, 0, false, VKMS_LUT_SIZE);
 
-	drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE);
-	drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE);
+	spin_lock_init(&vkms_crtc->lock);
+	spin_lock_init(&vkms_crtc->composer_lock);
 
-	spin_lock_init(&vkms_out->lock);
-	spin_lock_init(&vkms_out->composer_lock);
+	vkms_crtc->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
+	if (!vkms_crtc->composer_workq)
+		return ERR_PTR(-ENOMEM);
 
-	vkms_out->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
-	if (!vkms_out->composer_workq)
-		return -ENOMEM;
+	ret = drmm_add_action_or_reset(&vkmsdev->drm, vkms_crtc_destroy_workqueue, vkms_crtc);
+	if (ret)
+		return ERR_PTR(ret);
 
-	return ret;
+	return vkms_crtc;
 }
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.h b/drivers/gpu/drm/vkms/vkms_crtc.h
index 9f5ce21f3425..dde28884a0a5 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.h
+++ b/drivers/gpu/drm/vkms/vkms_crtc.h
@@ -48,7 +48,6 @@ struct vkms_crtc_state {
  * @wb_connecter: DRM writeback connector used for this output
  * @vblank_hrtimer:
  * @period_ns:
- * @event:
  * @composer_workq: Ordered workqueue for composer_work
  * @lock: Lock used to project concurrent acces to the composer
  * @composer_enabled: Protected by @lock.
@@ -61,7 +60,6 @@ struct vkms_crtc {
 	struct drm_writeback_connector wb_connector;
 	struct hrtimer vblank_hrtimer;
 	ktime_t period_ns;
-	struct drm_pending_vblank_event *event;
 	struct workqueue_struct *composer_workq;
 	spinlock_t lock;
 
@@ -71,17 +69,22 @@ struct vkms_crtc {
 	spinlock_t composer_lock;
 };
 
-#define to_vkms_crtc_state(target)\
+#define drm_crtc_state_to_vkms_crtc_state(target)\
 	container_of(target, struct vkms_crtc_state, base)
 
+#define drm_crtc_to_vkms_crtc(target) \
+	container_of(target, struct vkms_crtc, base)
+
+#define hrtimer_to_vkms_crtc(target) \
+	container_of(target, struct vkms_crtc, vblank_hrtimer)
+
 /**
  * vkms_crtc_init() - Initialize a crtc for vkms
- * @dev: drm_device associated with the vkms buffer
- * @crtc: uninitialized crtc device
+ * @vkmsdev: drm_device associated with the vkms buffer
  * @primary: primary plane to attach to the crtc
  * @cursor plane to attach to the crtc
  */
-int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
-		   struct drm_plane *primary, struct drm_plane *cursor);
-
+struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
+				 struct drm_plane *primary,
+				 struct drm_plane *cursor);
 #endif //_VKMS_CRTC_H
diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
index 5907877bdfa0..e79832e10f3c 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.c
+++ b/drivers/gpu/drm/vkms/vkms_drv.c
@@ -31,6 +31,7 @@
 
 #include <drm/drm_print.h>
 #include <drm/drm_debugfs.h>
+#include <drm/drm_edid.h>
 
 #define DRIVER_NAME	"vkms"
 #define DRIVER_DESC	"Virtual Kernel Mode Setting"
@@ -46,7 +47,8 @@ MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support");
 
 static bool enable_writeback = true;
 module_param_named(enable_writeback, enable_writeback, bool, 0444);
-MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector support");
+MODULE_PARM_DESC(enable_writeback,
+		 "Enable/Disable writeback connector support");
 
 static bool enable_overlay;
 module_param_named(enable_overlay, enable_overlay, bool, 0444);
@@ -54,14 +56,6 @@ MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support");
 
 DEFINE_DRM_GEM_FOPS(vkms_driver_fops);
 
-static void vkms_release(struct drm_device *dev)
-{
-	struct vkms_device *vkms = drm_device_to_vkms_device(dev);
-
-	if (vkms->output.composer_workq)
-		destroy_workqueue(vkms->output.composer_workq);
-}
-
 static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
 {
 	struct drm_device *dev = old_state->dev;
@@ -82,7 +76,8 @@ static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
 	drm_atomic_helper_wait_for_flip_done(dev, old_state);
 
 	for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {
-		struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(old_crtc_state);
+		struct vkms_crtc_state *vkms_state =
+			drm_crtc_state_to_vkms_crtc_state(old_crtc_state);
 
 		flush_work(&vkms_state->composer_work);
 	}
@@ -109,7 +104,6 @@ static const struct drm_debugfs_info vkms_config_debugfs_list[] = {
 
 static const struct drm_driver vkms_driver = {
 	.driver_features	= DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM,
-	.release		= vkms_release,
 	.fops			= &vkms_driver_fops,
 	DRM_GEM_SHMEM_DRIVER_OPS,
 
@@ -148,6 +142,124 @@ static const struct drm_mode_config_helper_funcs vkms_mode_config_helpers = {
 	.atomic_commit_tail = vkms_atomic_commit_tail,
 };
 
+static const struct drm_connector_funcs vkms_connector_funcs = {
+	.fill_modes = drm_helper_probe_single_connector_modes,
+	.reset = drm_atomic_helper_connector_reset,
+	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+};
+
+static const struct drm_encoder_funcs vkms_encoder_funcs = {};
+
+static int vkms_conn_get_modes(struct drm_connector *connector)
+{
+	int count;
+
+	/* Use the default modes list from drm */
+	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
+	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
+
+	return count;
+}
+
+static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
+	.get_modes = vkms_conn_get_modes,
+};
+
+static int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc)
+{
+	struct drm_device *dev = &vkmsdev->drm;
+	struct drm_connector *connector;
+	struct drm_encoder *encoder;
+	struct vkms_crtc *crtc;
+	struct drm_plane *plane;
+	struct vkms_plane *primary, *cursor, *overlay = NULL;
+	int ret;
+	int writeback;
+	unsigned int n;
+
+	/*
+	 * Initialize used plane. One primary plane is required to perform the composition.
+	 *
+	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
+	 * composition.
+	 */
+	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	if (vkmsdev->config->overlay) {
+		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
+			overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc);
+			if (IS_ERR(overlay))
+				return PTR_ERR(overlay);
+		}
+	}
+
+	if (vkmsdev->config->cursor) {
+		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc);
+		if (IS_ERR(cursor))
+			return PTR_ERR(cursor);
+	}
+
+	/* [1]: Initialize the crtc component */
+	crtc = vkms_crtc_init(vkmsdev, &primary->base,
+			      cursor ? &cursor->base : NULL);
+	if (IS_ERR(crtc))
+		return PTR_ERR(crtc);
+
+	/* Enable the output's CRTC for all the planes */
+	drm_for_each_plane(plane, &vkmsdev->drm) {
+		plane->possible_crtcs |= drm_crtc_mask(&crtc->base);
+	}
+
+	/* Initialize the connector component */
+	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
+	if (!connector)
+		return -ENOMEM;
+
+	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
+				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
+	if (ret) {
+		DRM_ERROR("Failed to init connector\n");
+		return ret;
+	}
+
+	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
+
+	/* Initialize the encoder component */
+	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
+	if (!encoder)
+		return -ENOMEM;
+
+	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
+				DRM_MODE_ENCODER_VIRTUAL, NULL);
+	if (ret) {
+		DRM_ERROR("Failed to init encoder\n");
+		return ret;
+	}
+
+	encoder->possible_crtcs = drm_crtc_mask(&crtc->base);
+
+	/* Attach the encoder and the connector */
+	ret = drm_connector_attach_encoder(connector, encoder);
+	if (ret) {
+		DRM_ERROR("Failed to attach connector to encoder\n");
+		return ret;
+	}
+
+	/* Initialize the writeback component */
+	if (vkmsdev->config->writeback) {
+		writeback = vkms_enable_writeback_connector(vkmsdev, crtc);
+		if (writeback)
+			DRM_ERROR("Failed to init writeback connector\n");
+	}
+
+	drm_mode_config_reset(dev);
+
+	return 0;
+}
+
 static int vkms_modeset_init(struct vkms_device *vkmsdev)
 {
 	struct drm_device *dev = &vkmsdev->drm;
diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
index 2c9d1f20ce84..08d0ef106e37 100644
--- a/drivers/gpu/drm/vkms/vkms_drv.h
+++ b/drivers/gpu/drm/vkms/vkms_drv.h
@@ -25,35 +25,6 @@
 
 #define VKMS_LUT_SIZE 256
 
-/**
- * struct vkms_output - Internal representation of all output components in vkms
- *
- * @crtc: Base crtc in drm
- * @encoder: DRM encoder used for this output
- * @connector: DRM connector used for this output
- * @wb_connecter: DRM writeback connector used for this output
- * @vblank_hrtimer:
- * @period_ns:
- * @composer_workq: Ordered workqueue for composer_work
- * @lock: Lock used to project concurrent acces to the composer
- * @composer_enabled: Protected by @lock.
- * @composer_state:
- * @composer_lock: Lock used internally to protect @composer_state members
- */
-struct vkms_output {
-	struct drm_crtc crtc;
-	struct drm_writeback_connector wb_connector;
-	struct hrtimer vblank_hrtimer;
-	ktime_t period_ns;
-	struct workqueue_struct *composer_workq;
-	spinlock_t lock;
-
-	bool composer_enabled;
-	struct vkms_crtc_state *composer_state;
-
-	spinlock_t composer_lock;
-};
-
 /**
  * struct vkms_config - General configuration for VKMS driver
  *
@@ -80,7 +51,6 @@ struct vkms_config {
 struct vkms_device {
 	struct drm_device drm;
 	struct platform_device *platform;
-	struct vkms_output output;
 	const struct vkms_config *config;
 };
 
@@ -88,20 +58,7 @@ struct vkms_device {
  * The following helpers are used to convert a member of a struct into its parent.
  */
 
-#define drm_crtc_to_vkms_output(target) \
-	container_of(target, struct vkms_output, crtc)
-
 #define drm_device_to_vkms_device(target) \
 	container_of(target, struct vkms_device, drm)
 
-/**
- * vkms_output_init() - Initialize all sub-components needed for a vkms device.
- *
- * @vkmsdev: vkms device to initialize
- * @possible_crtc_index: Crtc which can be attached to the planes. The caller must ensure that
- * possible_crtc_index is positive and less or equals to 31.
- */
-
-int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index);
-
 #endif /* _VKMS_DRV_H_ */
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
deleted file mode 100644
index cb8507917b5f..000000000000
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ /dev/null
@@ -1,135 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_edid.h>
-#include <drm/drm_probe_helper.h>
-#include <drm/drm_managed.h>
-
-#include "vkms_writeback.h"
-#include "vkms_plane.h"
-#include "vkms_crtc.h"
-
-static const struct drm_connector_funcs vkms_connector_funcs = {
-	.fill_modes = drm_helper_probe_single_connector_modes,
-	.reset = drm_atomic_helper_connector_reset,
-	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static const struct drm_encoder_funcs vkms_encoder_funcs = {};
-
-static int vkms_conn_get_modes(struct drm_connector *connector)
-{
-	int count;
-
-	/* Use the default modes list from drm */
-	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
-	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
-
-	return count;
-}
-
-static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
-	.get_modes    = vkms_conn_get_modes,
-};
-
-static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int possible_crtc_index,
-				  struct drm_crtc *crtc)
-{
-	struct vkms_plane *overlay;
-
-	overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc_index);
-	if (IS_ERR(overlay))
-		return PTR_ERR(overlay);
-
-	if (!overlay->base.possible_crtcs)
-		overlay->base.possible_crtcs = drm_crtc_mask(crtc);
-
-	return 0;
-}
-
-int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
-{
-	struct vkms_output *output = &vkmsdev->output;
-	struct drm_device *dev = &vkmsdev->drm;
-	struct drm_connector *connector;
-	struct drm_encoder *encoder;
-	struct drm_crtc *crtc = &output->crtc;
-	struct vkms_plane *primary, *cursor = NULL;
-	int ret;
-	int writeback;
-	unsigned int n;
-
-	/*
-	 * Initialize used plane. One primary plane is required to perform the composition.
-	 *
-	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
-	 * composition.
-	 */
-	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc_index);
-	if (IS_ERR(primary))
-		return PTR_ERR(primary);
-
-	if (vkmsdev->config->overlay) {
-		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
-			ret = vkms_add_overlay_plane(vkmsdev, possible_crtc_index, crtc);
-			if (ret)
-				return ret;
-		}
-	}
-
-	if (vkmsdev->config->cursor) {
-		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc_index);
-		if (IS_ERR(cursor))
-			return PTR_ERR(cursor);
-	}
-
-	ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base);
-	if (ret)
-		return ret;
-
-	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
-	if (!connector)
-		return -ENOMEM;
-
-	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
-				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
-	if (ret) {
-		DRM_ERROR("Failed to init connector\n");
-		return ret;
-	}
-
-	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
-
-	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
-	if (!encoder)
-		return -ENOMEM;
-
-	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
-				DRM_MODE_ENCODER_VIRTUAL, NULL);
-	if (ret) {
-		DRM_ERROR("Failed to init encoder\n");
-		return ret;
-	}
-	/*
-	 * This is an hardcoded value to select crtc for the encoder.
-	 * 1 here designate the first registered CRTC, the one allocated in [1]
-	 */
-	encoder->possible_crtcs = 1;
-
-	ret = drm_connector_attach_encoder(connector, encoder);
-	if (ret) {
-		DRM_ERROR("Failed to attach connector to encoder\n");
-		return ret;
-	}
-
-	if (vkmsdev->config->writeback) {
-		writeback = vkms_enable_writeback_connector(vkmsdev);
-		if (writeback)
-			DRM_ERROR("Failed to init writeback connector\n");
-	}
-
-	drm_mode_config_reset(dev);
-
-	return 0;
-}
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index 5e75880a5845..322e247979b2 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -110,7 +110,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
 				struct drm_writeback_job *job)
 {
 	struct vkms_writeback_job *vkmsjob = job->priv;
-	struct vkms_device *vkmsdev;
+	struct vkms_crtc *vkms_crtc = container_of(connector, struct vkms_crtc, wb_connector);
 
 	if (!job->fb)
 		return;
@@ -119,8 +119,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
 
 	drm_framebuffer_put(vkmsjob->wb_frame_info.fb);
 
-	vkmsdev = drm_device_to_vkms_device(job->fb->dev);
-	vkms_set_composer(&vkmsdev->output, false);
+	vkms_set_composer(vkms_crtc, false);
 	kfree(vkmsjob);
 }
 
@@ -129,10 +128,8 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
 {
 	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
 											 conn);
-	struct vkms_device *vkmsdev = drm_device_to_vkms_device(conn->dev);
-	struct vkms_output *output = &vkmsdev->output;
+	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(connector_state->crtc);
 	struct drm_writeback_connector *wb_conn = &output->wb_connector;
-	struct drm_connector_state *conn_state = wb_conn->base.state;
 	struct vkms_crtc_state *crtc_state = output->composer_state;
 	struct drm_framebuffer *fb = connector_state->writeback_job->fb;
 	u16 crtc_height = crtc_state->base.crtc->mode.vdisplay;
@@ -141,12 +138,12 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
 	struct vkms_frame_info *wb_frame_info;
 	u32 wb_format = fb->format->format;
 
-	if (!conn_state)
+	if (!connector_state)
 		return;
 
-	vkms_set_composer(&vkmsdev->output, true);
+	vkms_set_composer(output, true);
 
-	active_wb = conn_state->writeback_job->priv;
+	active_wb = connector_state->writeback_job->priv;
 	wb_frame_info = &active_wb->wb_frame_info;
 
 	spin_lock_irq(&output->composer_lock);
@@ -167,9 +164,10 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = {
 	.atomic_check = vkms_wb_atomic_check,
 };
 
-int vkms_enable_writeback_connector(struct vkms_device *vkmsdev)
+int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,
+				    struct vkms_crtc *vkms_crtc)
 {
-	struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector;
+	struct drm_writeback_connector *wb = &vkms_crtc->wb_connector;
 
 	drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs);
 
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.h b/drivers/gpu/drm/vkms/vkms_writeback.h
index 44dff15faff6..39613a2408be 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.h
+++ b/drivers/gpu/drm/vkms/vkms_writeback.h
@@ -16,6 +16,6 @@ struct vkms_writeback_job {
 };
 
 /* Writeback */
-int vkms_enable_writeback_connector(struct vkms_device *vkmsdev);
+int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_crtc *vkms_crtc);
 
 #endif //_VKMS_WRITEBACK_H

-- 
2.44.2

[PATCH RFC 3/4] drm/vkms: Switch to managed for crtc

[José Expósito]

> The current VKMS driver uses non-managed function to create crtcs. It

s/crtcs/CRTCs

> is not an issue yet, but in order to support multiple devices easly,

s/easly/easily

> convert this code to use drm and device managed helpers.
> 
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>

I think that this patch is doing different things that we could split in simpler
diffs.

Moving the code from vkms_output.c to vkms_drv.c be its own patch.

I'm not sure whether the calls to drm_mode_crtc_set_gamma_size() and
drm_crtc_enable_color_mgmt() should go here or they belong to a different patch.

Other than that, I added a couple of comments:

> ---
>  drivers/gpu/drm/vkms/vkms_composer.c  |  10 +--
>  drivers/gpu/drm/vkms/vkms_composer.h  |   2 +-
>  drivers/gpu/drm/vkms/vkms_crtc.c      |  75 ++++++++++++-------
>  drivers/gpu/drm/vkms/vkms_crtc.h      |  19 +++--
>  drivers/gpu/drm/vkms/vkms_drv.c       | 134 ++++++++++++++++++++++++++++++---
>  drivers/gpu/drm/vkms/vkms_drv.h       |  43 -----------
>  drivers/gpu/drm/vkms/vkms_output.c    | 135 ----------------------------------
>  drivers/gpu/drm/vkms/vkms_writeback.c |  20 +++--
>  drivers/gpu/drm/vkms/vkms_writeback.h |   2 +-
>  9 files changed, 197 insertions(+), 243 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
> index 15ef07ed304e..9b2f578c2eb1 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -515,7 +515,7 @@ void vkms_composer_worker(struct work_struct *work)
>  							  composer_work);
>  	struct drm_crtc *crtc = crtc_state->base.crtc;
>  	struct vkms_writeback_job *active_wb = crtc_state->active_writeback;
> -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
>  	bool crc_pending, wb_pending;
>  	u64 frame_start, frame_end;
>  	u32 crc32 = 0;
> @@ -616,12 +616,12 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
>  	return 0;
>  }
>  
> -void vkms_set_composer(struct vkms_output *out, bool enabled)
> +void vkms_set_composer(struct vkms_crtc *out, bool enabled)
>  {
>  	bool old_enabled;
>  
>  	if (enabled)
> -		drm_crtc_vblank_get(&out->crtc);
> +		drm_crtc_vblank_get(&out->base);
>  
>  	spin_lock_irq(&out->lock);
>  	old_enabled = out->composer_enabled;
> @@ -629,12 +629,12 @@ void vkms_set_composer(struct vkms_output *out, bool enabled)
>  	spin_unlock_irq(&out->lock);
>  
>  	if (old_enabled)
> -		drm_crtc_vblank_put(&out->crtc);
> +		drm_crtc_vblank_put(&out->base);
>  }
>  
>  int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
>  {
> -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
>  	bool enabled = false;
>  	int ret = 0;
>  
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
> index 91b33af1e013..77efd2e3a63a 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.h
> +++ b/drivers/gpu/drm/vkms/vkms_composer.h
> @@ -7,7 +7,7 @@
>  #include "vkms_crtc.h"
>  
>  void vkms_composer_worker(struct work_struct *work);
> -void vkms_set_composer(struct vkms_output *out, bool enabled);
> +void vkms_set_composer(struct vkms_crtc *out, bool enabled);
>  
>  /* CRC Support */
>  const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count);
> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
> index 6fae43932b60..47e62fb3e404 100644
> --- a/drivers/gpu/drm/vkms/vkms_crtc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> @@ -6,6 +6,8 @@
>  #include <drm/drm_atomic_helper.h>
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_vblank.h>
> +#include <drm/drm_managed.h>
> +#include <drm/drm_gem_atomic_helper.h>
>  #include <drm/drm_print.h>
>  
>  #include "vkms_crtc.h"
> @@ -14,9 +16,8 @@
>  
>  static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
>  {
> -	struct vkms_output *output = container_of(timer, struct vkms_output,
> -						  vblank_hrtimer);
> -	struct drm_crtc *crtc = &output->crtc;
> +	struct vkms_crtc *output = hrtimer_to_vkms_crtc(timer);
> +	struct drm_crtc *crtc = &output->base;
>  	struct vkms_crtc_state *state;
>  	u64 ret_overrun;
>  	bool ret, fence_cookie;
> @@ -64,8 +65,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
>  
>  static int vkms_enable_vblank(struct drm_crtc *crtc)
>  {
> +	struct drm_device *dev = crtc->dev;

I think this variable should throw warning because it is unused.

I imagine you are already doing it but you can compile with "make W=1 C=1" to
get this errors in the log.

>  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
> -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
>  
>  	drm_calc_timestamping_constants(crtc, &crtc->mode);
>  
> @@ -79,7 +81,7 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
>  
>  static void vkms_disable_vblank(struct drm_crtc *crtc)
>  {
> -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
>  
>  	hrtimer_cancel(&out->vblank_hrtimer);
>  }
> @@ -89,8 +91,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
>  				      bool in_vblank_irq)
>  {
>  	struct drm_device *dev = crtc->dev;

This one should throw a warning as well.

> -	struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev);
> -	struct vkms_output *output = &vkmsdev->output;
> +	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(crtc);
>  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
>  
>  	if (!READ_ONCE(vblank->enabled)) {
> @@ -137,7 +138,7 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc)
>  static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc,
>  					   struct drm_crtc_state *state)
>  {
> -	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(state);
> +	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(state);
>  
>  	__drm_atomic_helper_crtc_destroy_state(state);
>  
> @@ -178,7 +179,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
>  {
>  	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
>  									  crtc);
> -	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(crtc_state);
> +	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(crtc_state);
>  	struct drm_plane *plane;
>  	struct drm_plane_state *plane_state;
>  	int i = 0, ret;
> @@ -234,7 +235,7 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
>  static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
>  				   struct drm_atomic_state *state)
>  {
> -	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
>  
>  	/* This lock is held across the atomic commit to block vblank timer
>  	 * from scheduling vkms_composer_worker until the composer is updated
> @@ -245,7 +246,7 @@ static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
>  static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
>  				   struct drm_atomic_state *state)
>  {
> -	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
> +	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
>  
>  	if (crtc->state->event) {
>  		spin_lock(&crtc->dev->event_lock);
> @@ -260,7 +261,7 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
>  		crtc->state->event = NULL;
>  	}
>  
> -	vkms_output->composer_state = to_vkms_crtc_state(crtc->state);
> +	vkms_output->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
>  
>  	spin_unlock_irq(&vkms_output->lock);
>  }
> @@ -273,30 +274,48 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
>  	.atomic_disable	= vkms_crtc_atomic_disable,
>  };
>  
> -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
> -		   struct drm_plane *primary, struct drm_plane *cursor)
> +static void vkms_crtc_destroy_workqueue(struct drm_device *dev, void *raw_vkms_crtc)
> +{
> +	struct vkms_crtc *vkms_crtc = raw_vkms_crtc;
> +
> +	destroy_workqueue(vkms_crtc->composer_workq);

I think that you might need to check "if (vkms_crtc->composer_workq)" first.

Check "git show 2fe2a8f40c21" for the explanation.

> +}
> +
> +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
> +				 struct drm_plane *primary,
> +				 struct drm_plane *cursor)
>  {
> -	struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc);
> +	struct drm_device *dev = &vkmsdev->drm;
> +	struct vkms_crtc *vkms_crtc;
>  	int ret;
>  
> -	ret = drmm_crtc_init_with_planes(dev, crtc, primary, cursor,
> -					 &vkms_crtc_funcs, NULL);
> +	vkms_crtc = drmm_crtc_alloc_with_planes(dev, struct vkms_crtc, base, primary, cursor,
> +						&vkms_crtc_funcs, NULL);
> +	if (IS_ERR(vkms_crtc)) {
> +		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to init CRTC\n");

Why DRM_DEV_ERROR() instead of DRM_ERROR()?

> +		return vkms_crtc;
> +	}
> +
> +	drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs);
> +
> +	ret = drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE);
>  	if (ret) {
> -		DRM_ERROR("Failed to init CRTC\n");
> -		return ret;
> +		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to set gamma size\n");
> +		return ERR_PTR(ret);
>  	}
>  
> -	drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
> +	drm_crtc_enable_color_mgmt(&vkms_crtc->base, 0, false, VKMS_LUT_SIZE);
>  
> -	drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE);
> -	drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE);
> +	spin_lock_init(&vkms_crtc->lock);
> +	spin_lock_init(&vkms_crtc->composer_lock);
>  
> -	spin_lock_init(&vkms_out->lock);
> -	spin_lock_init(&vkms_out->composer_lock);
> +	vkms_crtc->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
> +	if (!vkms_crtc->composer_workq)
> +		return ERR_PTR(-ENOMEM);
>  
> -	vkms_out->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
> -	if (!vkms_out->composer_workq)
> -		return -ENOMEM;
> +	ret = drmm_add_action_or_reset(&vkmsdev->drm, vkms_crtc_destroy_workqueue, vkms_crtc);

&vkmsdev->drm => dev

> +	if (ret)
> +		return ERR_PTR(ret);
>  
> -	return ret;
> +	return vkms_crtc;
>  }
> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.h b/drivers/gpu/drm/vkms/vkms_crtc.h
> index 9f5ce21f3425..dde28884a0a5 100644
> --- a/drivers/gpu/drm/vkms/vkms_crtc.h
> +++ b/drivers/gpu/drm/vkms/vkms_crtc.h
> @@ -48,7 +48,6 @@ struct vkms_crtc_state {
>   * @wb_connecter: DRM writeback connector used for this output
>   * @vblank_hrtimer:
>   * @period_ns:
> - * @event:
>   * @composer_workq: Ordered workqueue for composer_work
>   * @lock: Lock used to project concurrent acces to the composer
>   * @composer_enabled: Protected by @lock.
> @@ -61,7 +60,6 @@ struct vkms_crtc {
>  	struct drm_writeback_connector wb_connector;
>  	struct hrtimer vblank_hrtimer;
>  	ktime_t period_ns;
> -	struct drm_pending_vblank_event *event;

Commit f3a47a269119 ("drm/vkms: Remove event from vkms_output") removed this
field. You might need to rebase this patch.

>  	struct workqueue_struct *composer_workq;
>  	spinlock_t lock;
>  
> @@ -71,17 +69,22 @@ struct vkms_crtc {
>  	spinlock_t composer_lock;
>  };
>  
> -#define to_vkms_crtc_state(target)\
> +#define drm_crtc_state_to_vkms_crtc_state(target)\
>  	container_of(target, struct vkms_crtc_state, base)
>  
> +#define drm_crtc_to_vkms_crtc(target) \
> +	container_of(target, struct vkms_crtc, base)
> +
> +#define hrtimer_to_vkms_crtc(target) \
> +	container_of(target, struct vkms_crtc, vblank_hrtimer)
> +
>  /**
>   * vkms_crtc_init() - Initialize a crtc for vkms
> - * @dev: drm_device associated with the vkms buffer
> - * @crtc: uninitialized crtc device
> + * @vkmsdev: drm_device associated with the vkms buffer
>   * @primary: primary plane to attach to the crtc
>   * @cursor plane to attach to the crtc
>   */
> -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
> -		   struct drm_plane *primary, struct drm_plane *cursor);
> -
> +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
> +				 struct drm_plane *primary,
> +				 struct drm_plane *cursor);
>  #endif //_VKMS_CRTC_H
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
> index 5907877bdfa0..e79832e10f3c 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.c
> +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> @@ -31,6 +31,7 @@
>  
>  #include <drm/drm_print.h>
>  #include <drm/drm_debugfs.h>
> +#include <drm/drm_edid.h>
>  
>  #define DRIVER_NAME	"vkms"
>  #define DRIVER_DESC	"Virtual Kernel Mode Setting"
> @@ -46,7 +47,8 @@ MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support");
>  
>  static bool enable_writeback = true;
>  module_param_named(enable_writeback, enable_writeback, bool, 0444);
> -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector support");
> +MODULE_PARM_DESC(enable_writeback,
> +		 "Enable/Disable writeback connector support");

Unwanted change?

>  static bool enable_overlay;
>  module_param_named(enable_overlay, enable_overlay, bool, 0444);
> @@ -54,14 +56,6 @@ MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support");
>  
>  DEFINE_DRM_GEM_FOPS(vkms_driver_fops);
>  
> -static void vkms_release(struct drm_device *dev)
> -{
> -	struct vkms_device *vkms = drm_device_to_vkms_device(dev);
> -
> -	if (vkms->output.composer_workq)
> -		destroy_workqueue(vkms->output.composer_workq);
> -}
> -
>  static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
>  {
>  	struct drm_device *dev = old_state->dev;
> @@ -82,7 +76,8 @@ static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
>  	drm_atomic_helper_wait_for_flip_done(dev, old_state);
>  
>  	for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> -		struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(old_crtc_state);
> +		struct vkms_crtc_state *vkms_state =
> +			drm_crtc_state_to_vkms_crtc_state(old_crtc_state);
>  
>  		flush_work(&vkms_state->composer_work);
>  	}
> @@ -109,7 +104,6 @@ static const struct drm_debugfs_info vkms_config_debugfs_list[] = {
>  
>  static const struct drm_driver vkms_driver = {
>  	.driver_features	= DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM,
> -	.release		= vkms_release,
>  	.fops			= &vkms_driver_fops,
>  	DRM_GEM_SHMEM_DRIVER_OPS,
>  
> @@ -148,6 +142,124 @@ static const struct drm_mode_config_helper_funcs vkms_mode_config_helpers = {
>  	.atomic_commit_tail = vkms_atomic_commit_tail,
>  };
>  
> +static const struct drm_connector_funcs vkms_connector_funcs = {
> +	.fill_modes = drm_helper_probe_single_connector_modes,
> +	.reset = drm_atomic_helper_connector_reset,
> +	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> +	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> +};
> +
> +static const struct drm_encoder_funcs vkms_encoder_funcs = {};
> +
> +static int vkms_conn_get_modes(struct drm_connector *connector)
> +{
> +	int count;
> +
> +	/* Use the default modes list from drm */
> +	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
> +	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
> +
> +	return count;
> +}
> +
> +static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
> +	.get_modes = vkms_conn_get_modes,
> +};
> +
> +static int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc)
> +{
> +	struct drm_device *dev = &vkmsdev->drm;
> +	struct drm_connector *connector;
> +	struct drm_encoder *encoder;
> +	struct vkms_crtc *crtc;
> +	struct drm_plane *plane;
> +	struct vkms_plane *primary, *cursor, *overlay = NULL;
> +	int ret;
> +	int writeback;
> +	unsigned int n;
> +
> +	/*
> +	 * Initialize used plane. One primary plane is required to perform the composition.
> +	 *
> +	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
> +	 * composition.
> +	 */
> +	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc);
> +	if (IS_ERR(primary))
> +		return PTR_ERR(primary);
> +
> +	if (vkmsdev->config->overlay) {
> +		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
> +			overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc);
> +			if (IS_ERR(overlay))
> +				return PTR_ERR(overlay);
> +		}
> +	}
> +
> +	if (vkmsdev->config->cursor) {
> +		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc);
> +		if (IS_ERR(cursor))
> +			return PTR_ERR(cursor);
> +	}
> +
> +	/* [1]: Initialize the crtc component */
> +	crtc = vkms_crtc_init(vkmsdev, &primary->base,
> +			      cursor ? &cursor->base : NULL);
> +	if (IS_ERR(crtc))
> +		return PTR_ERR(crtc);
> +
> +	/* Enable the output's CRTC for all the planes */
> +	drm_for_each_plane(plane, &vkmsdev->drm) {
> +		plane->possible_crtcs |= drm_crtc_mask(&crtc->base);
> +	}
> +
> +	/* Initialize the connector component */
> +	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> +	if (!connector)
> +		return -ENOMEM;
> +
> +	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> +				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
> +	if (ret) {
> +		DRM_ERROR("Failed to init connector\n");
> +		return ret;
> +	}
> +
> +	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> +
> +	/* Initialize the encoder component */
> +	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
> +	if (!encoder)
> +		return -ENOMEM;
> +
> +	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> +				DRM_MODE_ENCODER_VIRTUAL, NULL);
> +	if (ret) {
> +		DRM_ERROR("Failed to init encoder\n");
> +		return ret;
> +	}
> +
> +	encoder->possible_crtcs = drm_crtc_mask(&crtc->base);
> +
> +	/* Attach the encoder and the connector */
> +	ret = drm_connector_attach_encoder(connector, encoder);
> +	if (ret) {
> +		DRM_ERROR("Failed to attach connector to encoder\n");
> +		return ret;
> +	}
> +
> +	/* Initialize the writeback component */
> +	if (vkmsdev->config->writeback) {
> +		writeback = vkms_enable_writeback_connector(vkmsdev, crtc);
> +		if (writeback)
> +			DRM_ERROR("Failed to init writeback connector\n");
> +	}
> +
> +	drm_mode_config_reset(dev);
> +
> +	return 0;
> +}
> +
>  static int vkms_modeset_init(struct vkms_device *vkmsdev)
>  {
>  	struct drm_device *dev = &vkmsdev->drm;
> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> index 2c9d1f20ce84..08d0ef106e37 100644
> --- a/drivers/gpu/drm/vkms/vkms_drv.h
> +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> @@ -25,35 +25,6 @@
>  
>  #define VKMS_LUT_SIZE 256
>  
> -/**
> - * struct vkms_output - Internal representation of all output components in vkms
> - *
> - * @crtc: Base crtc in drm
> - * @encoder: DRM encoder used for this output
> - * @connector: DRM connector used for this output
> - * @wb_connecter: DRM writeback connector used for this output
> - * @vblank_hrtimer:
> - * @period_ns:
> - * @composer_workq: Ordered workqueue for composer_work
> - * @lock: Lock used to project concurrent acces to the composer
> - * @composer_enabled: Protected by @lock.
> - * @composer_state:
> - * @composer_lock: Lock used internally to protect @composer_state members
> - */
> -struct vkms_output {
> -	struct drm_crtc crtc;
> -	struct drm_writeback_connector wb_connector;
> -	struct hrtimer vblank_hrtimer;
> -	ktime_t period_ns;
> -	struct workqueue_struct *composer_workq;
> -	spinlock_t lock;
> -
> -	bool composer_enabled;
> -	struct vkms_crtc_state *composer_state;
> -
> -	spinlock_t composer_lock;
> -};
> -
>  /**
>   * struct vkms_config - General configuration for VKMS driver
>   *
> @@ -80,7 +51,6 @@ struct vkms_config {
>  struct vkms_device {
>  	struct drm_device drm;
>  	struct platform_device *platform;
> -	struct vkms_output output;
>  	const struct vkms_config *config;
>  };
>  
> @@ -88,20 +58,7 @@ struct vkms_device {
>   * The following helpers are used to convert a member of a struct into its parent.
>   */
>  
> -#define drm_crtc_to_vkms_output(target) \
> -	container_of(target, struct vkms_output, crtc)
> -
>  #define drm_device_to_vkms_device(target) \
>  	container_of(target, struct vkms_device, drm)
>  
> -/**
> - * vkms_output_init() - Initialize all sub-components needed for a vkms device.
> - *
> - * @vkmsdev: vkms device to initialize
> - * @possible_crtc_index: Crtc which can be attached to the planes. The caller must ensure that
> - * possible_crtc_index is positive and less or equals to 31.
> - */
> -
> -int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index);
> -
>  #endif /* _VKMS_DRV_H_ */
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> deleted file mode 100644
> index cb8507917b5f..000000000000
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ /dev/null
> @@ -1,135 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -
> -#include <drm/drm_atomic_helper.h>
> -#include <drm/drm_edid.h>
> -#include <drm/drm_probe_helper.h>
> -#include <drm/drm_managed.h>
> -
> -#include "vkms_writeback.h"
> -#include "vkms_plane.h"
> -#include "vkms_crtc.h"
> -
> -static const struct drm_connector_funcs vkms_connector_funcs = {
> -	.fill_modes = drm_helper_probe_single_connector_modes,
> -	.reset = drm_atomic_helper_connector_reset,
> -	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> -	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> -};
> -
> -static const struct drm_encoder_funcs vkms_encoder_funcs = {};
> -
> -static int vkms_conn_get_modes(struct drm_connector *connector)
> -{
> -	int count;
> -
> -	/* Use the default modes list from drm */
> -	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
> -	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
> -
> -	return count;
> -}
> -
> -static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
> -	.get_modes    = vkms_conn_get_modes,
> -};
> -
> -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int possible_crtc_index,
> -				  struct drm_crtc *crtc)
> -{
> -	struct vkms_plane *overlay;
> -
> -	overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc_index);
> -	if (IS_ERR(overlay))
> -		return PTR_ERR(overlay);
> -
> -	if (!overlay->base.possible_crtcs)
> -		overlay->base.possible_crtcs = drm_crtc_mask(crtc);
> -
> -	return 0;
> -}
> -
> -int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> -{
> -	struct vkms_output *output = &vkmsdev->output;
> -	struct drm_device *dev = &vkmsdev->drm;
> -	struct drm_connector *connector;
> -	struct drm_encoder *encoder;
> -	struct drm_crtc *crtc = &output->crtc;
> -	struct vkms_plane *primary, *cursor = NULL;
> -	int ret;
> -	int writeback;
> -	unsigned int n;
> -
> -	/*
> -	 * Initialize used plane. One primary plane is required to perform the composition.
> -	 *
> -	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
> -	 * composition.
> -	 */
> -	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc_index);
> -	if (IS_ERR(primary))
> -		return PTR_ERR(primary);
> -
> -	if (vkmsdev->config->overlay) {
> -		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
> -			ret = vkms_add_overlay_plane(vkmsdev, possible_crtc_index, crtc);
> -			if (ret)
> -				return ret;
> -		}
> -	}
> -
> -	if (vkmsdev->config->cursor) {
> -		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc_index);
> -		if (IS_ERR(cursor))
> -			return PTR_ERR(cursor);
> -	}
> -
> -	ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base);
> -	if (ret)
> -		return ret;
> -
> -	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> -	if (!connector)
> -		return -ENOMEM;
> -
> -	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> -				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
> -	if (ret) {
> -		DRM_ERROR("Failed to init connector\n");
> -		return ret;
> -	}
> -
> -	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> -
> -	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
> -	if (!encoder)
> -		return -ENOMEM;
> -
> -	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> -				DRM_MODE_ENCODER_VIRTUAL, NULL);
> -	if (ret) {
> -		DRM_ERROR("Failed to init encoder\n");
> -		return ret;
> -	}
> -	/*
> -	 * This is an hardcoded value to select crtc for the encoder.
> -	 * 1 here designate the first registered CRTC, the one allocated in [1]
> -	 */
> -	encoder->possible_crtcs = 1;
> -
> -	ret = drm_connector_attach_encoder(connector, encoder);
> -	if (ret) {
> -		DRM_ERROR("Failed to attach connector to encoder\n");
> -		return ret;
> -	}
> -
> -	if (vkmsdev->config->writeback) {
> -		writeback = vkms_enable_writeback_connector(vkmsdev);
> -		if (writeback)
> -			DRM_ERROR("Failed to init writeback connector\n");
> -	}
> -
> -	drm_mode_config_reset(dev);
> -
> -	return 0;
> -}
> diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
> index 5e75880a5845..322e247979b2 100644
> --- a/drivers/gpu/drm/vkms/vkms_writeback.c
> +++ b/drivers/gpu/drm/vkms/vkms_writeback.c
> @@ -110,7 +110,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
>  				struct drm_writeback_job *job)
>  {
>  	struct vkms_writeback_job *vkmsjob = job->priv;
> -	struct vkms_device *vkmsdev;
> +	struct vkms_crtc *vkms_crtc = container_of(connector, struct vkms_crtc, wb_connector);
>  
>  	if (!job->fb)
>  		return;
> @@ -119,8 +119,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
>  
>  	drm_framebuffer_put(vkmsjob->wb_frame_info.fb);
>  
> -	vkmsdev = drm_device_to_vkms_device(job->fb->dev);
> -	vkms_set_composer(&vkmsdev->output, false);
> +	vkms_set_composer(vkms_crtc, false);
>  	kfree(vkmsjob);
>  }
>  
> @@ -129,10 +128,8 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
>  {
>  	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
>  											 conn);
> -	struct vkms_device *vkmsdev = drm_device_to_vkms_device(conn->dev);
> -	struct vkms_output *output = &vkmsdev->output;
> +	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(connector_state->crtc);
>  	struct drm_writeback_connector *wb_conn = &output->wb_connector;
> -	struct drm_connector_state *conn_state = wb_conn->base.state;
>  	struct vkms_crtc_state *crtc_state = output->composer_state;
>  	struct drm_framebuffer *fb = connector_state->writeback_job->fb;
>  	u16 crtc_height = crtc_state->base.crtc->mode.vdisplay;
> @@ -141,12 +138,12 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
>  	struct vkms_frame_info *wb_frame_info;
>  	u32 wb_format = fb->format->format;
>  
> -	if (!conn_state)
> +	if (!connector_state)
>  		return;
>  
> -	vkms_set_composer(&vkmsdev->output, true);
> +	vkms_set_composer(output, true);
>  
> -	active_wb = conn_state->writeback_job->priv;
> +	active_wb = connector_state->writeback_job->priv;
>  	wb_frame_info = &active_wb->wb_frame_info;
>  
>  	spin_lock_irq(&output->composer_lock);
> @@ -167,9 +164,10 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = {
>  	.atomic_check = vkms_wb_atomic_check,
>  };
>  
> -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev)
> +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,
> +				    struct vkms_crtc *vkms_crtc)
>  {
> -	struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector;
> +	struct drm_writeback_connector *wb = &vkms_crtc->wb_connector;
>  
>  	drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs);
>  
> diff --git a/drivers/gpu/drm/vkms/vkms_writeback.h b/drivers/gpu/drm/vkms/vkms_writeback.h
> index 44dff15faff6..39613a2408be 100644
> --- a/drivers/gpu/drm/vkms/vkms_writeback.h
> +++ b/drivers/gpu/drm/vkms/vkms_writeback.h
> @@ -16,6 +16,6 @@ struct vkms_writeback_job {
>  };
>  
>  /* Writeback */
> -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev);
> +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_crtc *vkms_crtc);
>  
>  #endif //_VKMS_WRITEBACK_H

Re: [PATCH RFC 3/4] drm/vkms: Switch to managed for crtc

[Louis Chauvet]

Le 20/08/24 - 11:09, José Expósito a écrit :
> > The current VKMS driver uses non-managed function to create crtcs. It
> 
> s/crtcs/CRTCs
> 
> > is not an issue yet, but in order to support multiple devices easly,
> 
> s/easly/easily
> 
> > convert this code to use drm and device managed helpers.
> > 
> > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
> 
> I think that this patch is doing different things that we could split in simpler
> diffs.
> 
> Moving the code from vkms_output.c to vkms_drv.c be its own patch.

I agree, but for the v2 I will not move anything outside vkms_output. It 
will be a future patch, maybe in the extract header series or 
vkms_config/configfs.
 
> I'm not sure whether the calls to drm_mode_crtc_set_gamma_size() and
> drm_crtc_enable_color_mgmt() should go here or they belong to a different patch.

I did not introduce new calls to those functions, just the test about the 
result of drm_mode_crtc_set_gamma_size that can fail. I will extract this 
to an other patch.

> Other than that, I added a couple of comments:

Thanks!

> > ---
> >  drivers/gpu/drm/vkms/vkms_composer.c  |  10 +--
> >  drivers/gpu/drm/vkms/vkms_composer.h  |   2 +-
> >  drivers/gpu/drm/vkms/vkms_crtc.c      |  75 ++++++++++++-------
> >  drivers/gpu/drm/vkms/vkms_crtc.h      |  19 +++--
> >  drivers/gpu/drm/vkms/vkms_drv.c       | 134 ++++++++++++++++++++++++++++++---
> >  drivers/gpu/drm/vkms/vkms_drv.h       |  43 -----------
> >  drivers/gpu/drm/vkms/vkms_output.c    | 135 ----------------------------------
> >  drivers/gpu/drm/vkms/vkms_writeback.c |  20 +++--
> >  drivers/gpu/drm/vkms/vkms_writeback.h |   2 +-
> >  9 files changed, 197 insertions(+), 243 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
> > index 15ef07ed304e..9b2f578c2eb1 100644
> > --- a/drivers/gpu/drm/vkms/vkms_composer.c
> > +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> > @@ -515,7 +515,7 @@ void vkms_composer_worker(struct work_struct *work)
> >  							  composer_work);
> >  	struct drm_crtc *crtc = crtc_state->base.crtc;
> >  	struct vkms_writeback_job *active_wb = crtc_state->active_writeback;
> > -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> >  	bool crc_pending, wb_pending;
> >  	u64 frame_start, frame_end;
> >  	u32 crc32 = 0;
> > @@ -616,12 +616,12 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
> >  	return 0;
> >  }
> >  
> > -void vkms_set_composer(struct vkms_output *out, bool enabled)
> > +void vkms_set_composer(struct vkms_crtc *out, bool enabled)
> >  {
> >  	bool old_enabled;
> >  
> >  	if (enabled)
> > -		drm_crtc_vblank_get(&out->crtc);
> > +		drm_crtc_vblank_get(&out->base);
> >  
> >  	spin_lock_irq(&out->lock);
> >  	old_enabled = out->composer_enabled;
> > @@ -629,12 +629,12 @@ void vkms_set_composer(struct vkms_output *out, bool enabled)
> >  	spin_unlock_irq(&out->lock);
> >  
> >  	if (old_enabled)
> > -		drm_crtc_vblank_put(&out->crtc);
> > +		drm_crtc_vblank_put(&out->base);
> >  }
> >  
> >  int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
> >  {
> > -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> >  	bool enabled = false;
> >  	int ret = 0;
> >  
> > diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
> > index 91b33af1e013..77efd2e3a63a 100644
> > --- a/drivers/gpu/drm/vkms/vkms_composer.h
> > +++ b/drivers/gpu/drm/vkms/vkms_composer.h
> > @@ -7,7 +7,7 @@
> >  #include "vkms_crtc.h"
> >  
> >  void vkms_composer_worker(struct work_struct *work);
> > -void vkms_set_composer(struct vkms_output *out, bool enabled);
> > +void vkms_set_composer(struct vkms_crtc *out, bool enabled);
> >  
> >  /* CRC Support */
> >  const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count);
> > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
> > index 6fae43932b60..47e62fb3e404 100644
> > --- a/drivers/gpu/drm/vkms/vkms_crtc.c
> > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> > @@ -6,6 +6,8 @@
> >  #include <drm/drm_atomic_helper.h>
> >  #include <drm/drm_probe_helper.h>
> >  #include <drm/drm_vblank.h>
> > +#include <drm/drm_managed.h>
> > +#include <drm/drm_gem_atomic_helper.h>
> >  #include <drm/drm_print.h>
> >  
> >  #include "vkms_crtc.h"
> > @@ -14,9 +16,8 @@
> >  
> >  static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
> >  {
> > -	struct vkms_output *output = container_of(timer, struct vkms_output,
> > -						  vblank_hrtimer);
> > -	struct drm_crtc *crtc = &output->crtc;
> > +	struct vkms_crtc *output = hrtimer_to_vkms_crtc(timer);
> > +	struct drm_crtc *crtc = &output->base;
> >  	struct vkms_crtc_state *state;
> >  	u64 ret_overrun;
> >  	bool ret, fence_cookie;
> > @@ -64,8 +65,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
> >  
> >  static int vkms_enable_vblank(struct drm_crtc *crtc)
> >  {
> > +	struct drm_device *dev = crtc->dev;
> 
> I think this variable should throw warning because it is unused.

Yes, and I have few other that I missed, will fix for v2.

> I imagine you are already doing it but you can compile with "make W=1 C=1" to
> get this errors in the log.
> 
> >  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
> > -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> >  
> >  	drm_calc_timestamping_constants(crtc, &crtc->mode);
> >  
> > @@ -79,7 +81,7 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
> >  
> >  static void vkms_disable_vblank(struct drm_crtc *crtc)
> >  {
> > -	struct vkms_output *out = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> >  
> >  	hrtimer_cancel(&out->vblank_hrtimer);
> >  }
> > @@ -89,8 +91,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
> >  				      bool in_vblank_irq)
> >  {
> >  	struct drm_device *dev = crtc->dev;
> 
> This one should throw a warning as well.
> 
> > -	struct vkms_device *vkmsdev = drm_device_to_vkms_device(dev);
> > -	struct vkms_output *output = &vkmsdev->output;
> > +	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(crtc);
> >  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
> >  
> >  	if (!READ_ONCE(vblank->enabled)) {
> > @@ -137,7 +138,7 @@ vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc)
> >  static void vkms_atomic_crtc_destroy_state(struct drm_crtc *crtc,
> >  					   struct drm_crtc_state *state)
> >  {
> > -	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(state);
> > +	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(state);
> >  
> >  	__drm_atomic_helper_crtc_destroy_state(state);
> >  
> > @@ -178,7 +179,7 @@ static int vkms_crtc_atomic_check(struct drm_crtc *crtc,
> >  {
> >  	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
> >  									  crtc);
> > -	struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(crtc_state);
> > +	struct vkms_crtc_state *vkms_state = drm_crtc_state_to_vkms_crtc_state(crtc_state);
> >  	struct drm_plane *plane;
> >  	struct drm_plane_state *plane_state;
> >  	int i = 0, ret;
> > @@ -234,7 +235,7 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
> >  static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
> >  				   struct drm_atomic_state *state)
> >  {
> > -	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
> >  
> >  	/* This lock is held across the atomic commit to block vblank timer
> >  	 * from scheduling vkms_composer_worker until the composer is updated
> > @@ -245,7 +246,7 @@ static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
> >  static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
> >  				   struct drm_atomic_state *state)
> >  {
> > -	struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc);
> > +	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
> >  
> >  	if (crtc->state->event) {
> >  		spin_lock(&crtc->dev->event_lock);
> > @@ -260,7 +261,7 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
> >  		crtc->state->event = NULL;
> >  	}
> >  
> > -	vkms_output->composer_state = to_vkms_crtc_state(crtc->state);
> > +	vkms_output->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
> >  
> >  	spin_unlock_irq(&vkms_output->lock);
> >  }
> > @@ -273,30 +274,48 @@ static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
> >  	.atomic_disable	= vkms_crtc_atomic_disable,
> >  };
> >  
> > -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
> > -		   struct drm_plane *primary, struct drm_plane *cursor)
> > +static void vkms_crtc_destroy_workqueue(struct drm_device *dev, void *raw_vkms_crtc)
> > +{
> > +	struct vkms_crtc *vkms_crtc = raw_vkms_crtc;
> > +
> > +	destroy_workqueue(vkms_crtc->composer_workq);
> 
> I think that you might need to check "if (vkms_crtc->composer_workq)" first.
> 
> Check "git show 2fe2a8f40c21" for the explanation.

I don't think this is needed, this function can only be called once 
drmm_add_action_or_reset, which is after the call to 
alloc_ordered_workqueue, so I think the situation described in 
2fe2a8f40c21 is impossible now. I can leave a comment before this 
destroy_workqueue if you think this could cause an issue.

> > +}
> > +
> > +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
> > +				 struct drm_plane *primary,
> > +				 struct drm_plane *cursor)
> >  {
> > -	struct vkms_output *vkms_out = drm_crtc_to_vkms_output(crtc);
> > +	struct drm_device *dev = &vkmsdev->drm;
> > +	struct vkms_crtc *vkms_crtc;
> >  	int ret;
> >  
> > -	ret = drmm_crtc_init_with_planes(dev, crtc, primary, cursor,
> > -					 &vkms_crtc_funcs, NULL);
> > +	vkms_crtc = drmm_crtc_alloc_with_planes(dev, struct vkms_crtc, base, primary, cursor,
> > +						&vkms_crtc_funcs, NULL);
> > +	if (IS_ERR(vkms_crtc)) {
> > +		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to init CRTC\n");
> 
> Why DRM_DEV_ERROR() instead of DRM_ERROR()?

Because this is related to a specific device, I think using DRM_DEV_* 
would be better. When we introduce ConfigFS, the userspace might be able 
to break things, so tracking which device failed can be helpful.

> > +		return vkms_crtc;
> > +	}
> > +
> > +	drm_crtc_helper_add(&vkms_crtc->base, &vkms_crtc_helper_funcs);
> > +
> > +	ret = drm_mode_crtc_set_gamma_size(&vkms_crtc->base, VKMS_LUT_SIZE);
> >  	if (ret) {
> > -		DRM_ERROR("Failed to init CRTC\n");
> > -		return ret;
> > +		DRM_DEV_ERROR(vkmsdev->drm.dev, "Failed to set gamma size\n");
> > +		return ERR_PTR(ret);
> >  	}
> >  
> > -	drm_crtc_helper_add(crtc, &vkms_crtc_helper_funcs);
> > +	drm_crtc_enable_color_mgmt(&vkms_crtc->base, 0, false, VKMS_LUT_SIZE);
> >  
> > -	drm_mode_crtc_set_gamma_size(crtc, VKMS_LUT_SIZE);
> > -	drm_crtc_enable_color_mgmt(crtc, 0, false, VKMS_LUT_SIZE);
> > +	spin_lock_init(&vkms_crtc->lock);
> > +	spin_lock_init(&vkms_crtc->composer_lock);
> >  
> > -	spin_lock_init(&vkms_out->lock);
> > -	spin_lock_init(&vkms_out->composer_lock);
> > +	vkms_crtc->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
> > +	if (!vkms_crtc->composer_workq)
> > +		return ERR_PTR(-ENOMEM);
> >  
> > -	vkms_out->composer_workq = alloc_ordered_workqueue("vkms_composer", 0);
> > -	if (!vkms_out->composer_workq)
> > -		return -ENOMEM;
> > +	ret = drmm_add_action_or_reset(&vkmsdev->drm, vkms_crtc_destroy_workqueue, vkms_crtc);
> 
> &vkmsdev->drm => dev
> 
> > +	if (ret)
> > +		return ERR_PTR(ret);
> >  
> > -	return ret;
> > +	return vkms_crtc;
> >  }
> > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.h b/drivers/gpu/drm/vkms/vkms_crtc.h
> > index 9f5ce21f3425..dde28884a0a5 100644
> > --- a/drivers/gpu/drm/vkms/vkms_crtc.h
> > +++ b/drivers/gpu/drm/vkms/vkms_crtc.h
> > @@ -48,7 +48,6 @@ struct vkms_crtc_state {
> >   * @wb_connecter: DRM writeback connector used for this output
> >   * @vblank_hrtimer:
> >   * @period_ns:
> > - * @event:
> >   * @composer_workq: Ordered workqueue for composer_work
> >   * @lock: Lock used to project concurrent acces to the composer
> >   * @composer_enabled: Protected by @lock.
> > @@ -61,7 +60,6 @@ struct vkms_crtc {
> >  	struct drm_writeback_connector wb_connector;
> >  	struct hrtimer vblank_hrtimer;
> >  	ktime_t period_ns;
> > -	struct drm_pending_vblank_event *event;
> 
> Commit f3a47a269119 ("drm/vkms: Remove event from vkms_output") removed this
> field. You might need to rebase this patch.

It was not merged yet when I wrote this code, thanks for the reminder!

> 
> >  	struct workqueue_struct *composer_workq;
> >  	spinlock_t lock;
> >  
> > @@ -71,17 +69,22 @@ struct vkms_crtc {
> >  	spinlock_t composer_lock;
> >  };
> >  
> > -#define to_vkms_crtc_state(target)\
> > +#define drm_crtc_state_to_vkms_crtc_state(target)\
> >  	container_of(target, struct vkms_crtc_state, base)
> >  
> > +#define drm_crtc_to_vkms_crtc(target) \
> > +	container_of(target, struct vkms_crtc, base)
> > +
> > +#define hrtimer_to_vkms_crtc(target) \
> > +	container_of(target, struct vkms_crtc, vblank_hrtimer)
> > +
> >  /**
> >   * vkms_crtc_init() - Initialize a crtc for vkms
> > - * @dev: drm_device associated with the vkms buffer
> > - * @crtc: uninitialized crtc device
> > + * @vkmsdev: drm_device associated with the vkms buffer
> >   * @primary: primary plane to attach to the crtc
> >   * @cursor plane to attach to the crtc
> >   */
> > -int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
> > -		   struct drm_plane *primary, struct drm_plane *cursor);
> > -
> > +struct vkms_crtc *vkms_crtc_init(struct vkms_device *vkmsdev,
> > +				 struct drm_plane *primary,
> > +				 struct drm_plane *cursor);
> >  #endif //_VKMS_CRTC_H
> > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c
> > index 5907877bdfa0..e79832e10f3c 100644
> > --- a/drivers/gpu/drm/vkms/vkms_drv.c
> > +++ b/drivers/gpu/drm/vkms/vkms_drv.c
> > @@ -31,6 +31,7 @@
> >  
> >  #include <drm/drm_print.h>
> >  #include <drm/drm_debugfs.h>
> > +#include <drm/drm_edid.h>
> >  
> >  #define DRIVER_NAME	"vkms"
> >  #define DRIVER_DESC	"Virtual Kernel Mode Setting"
> > @@ -46,7 +47,8 @@ MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support");
> >  
> >  static bool enable_writeback = true;
> >  module_param_named(enable_writeback, enable_writeback, bool, 0444);
> > -MODULE_PARM_DESC(enable_writeback, "Enable/Disable writeback connector support");
> > +MODULE_PARM_DESC(enable_writeback,
> > +		 "Enable/Disable writeback connector support");
> 
> Unwanted change?

Yep!

> >  static bool enable_overlay;
> >  module_param_named(enable_overlay, enable_overlay, bool, 0444);
> > @@ -54,14 +56,6 @@ MODULE_PARM_DESC(enable_overlay, "Enable/Disable overlay support");
> >  
> >  DEFINE_DRM_GEM_FOPS(vkms_driver_fops);
> >  
> > -static void vkms_release(struct drm_device *dev)
> > -{
> > -	struct vkms_device *vkms = drm_device_to_vkms_device(dev);
> > -
> > -	if (vkms->output.composer_workq)
> > -		destroy_workqueue(vkms->output.composer_workq);
> > -}
> > -
> >  static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
> >  {
> >  	struct drm_device *dev = old_state->dev;
> > @@ -82,7 +76,8 @@ static void vkms_atomic_commit_tail(struct drm_atomic_state *old_state)
> >  	drm_atomic_helper_wait_for_flip_done(dev, old_state);
> >  
> >  	for_each_old_crtc_in_state(old_state, crtc, old_crtc_state, i) {
> > -		struct vkms_crtc_state *vkms_state = to_vkms_crtc_state(old_crtc_state);
> > +		struct vkms_crtc_state *vkms_state =
> > +			drm_crtc_state_to_vkms_crtc_state(old_crtc_state);
> >  
> >  		flush_work(&vkms_state->composer_work);
> >  	}
> > @@ -109,7 +104,6 @@ static const struct drm_debugfs_info vkms_config_debugfs_list[] = {
> >  
> >  static const struct drm_driver vkms_driver = {
> >  	.driver_features	= DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_GEM,
> > -	.release		= vkms_release,
> >  	.fops			= &vkms_driver_fops,
> >  	DRM_GEM_SHMEM_DRIVER_OPS,
> >  
> > @@ -148,6 +142,124 @@ static const struct drm_mode_config_helper_funcs vkms_mode_config_helpers = {
> >  	.atomic_commit_tail = vkms_atomic_commit_tail,
> >  };
> >  
> > +static const struct drm_connector_funcs vkms_connector_funcs = {
> > +	.fill_modes = drm_helper_probe_single_connector_modes,
> > +	.reset = drm_atomic_helper_connector_reset,
> > +	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> > +	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > +};
> > +
> > +static const struct drm_encoder_funcs vkms_encoder_funcs = {};
> > +
> > +static int vkms_conn_get_modes(struct drm_connector *connector)
> > +{
> > +	int count;
> > +
> > +	/* Use the default modes list from drm */
> > +	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
> > +	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
> > +
> > +	return count;
> > +}
> > +
> > +static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
> > +	.get_modes = vkms_conn_get_modes,
> > +};
> > +
> > +static int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc)
> > +{
> > +	struct drm_device *dev = &vkmsdev->drm;
> > +	struct drm_connector *connector;
> > +	struct drm_encoder *encoder;
> > +	struct vkms_crtc *crtc;
> > +	struct drm_plane *plane;
> > +	struct vkms_plane *primary, *cursor, *overlay = NULL;
> > +	int ret;
> > +	int writeback;
> > +	unsigned int n;
> > +
> > +	/*
> > +	 * Initialize used plane. One primary plane is required to perform the composition.
> > +	 *
> > +	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
> > +	 * composition.
> > +	 */
> > +	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc);
> > +	if (IS_ERR(primary))
> > +		return PTR_ERR(primary);
> > +
> > +	if (vkmsdev->config->overlay) {
> > +		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
> > +			overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc);
> > +			if (IS_ERR(overlay))
> > +				return PTR_ERR(overlay);
> > +		}
> > +	}
> > +
> > +	if (vkmsdev->config->cursor) {
> > +		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc);
> > +		if (IS_ERR(cursor))
> > +			return PTR_ERR(cursor);
> > +	}
> > +
> > +	/* [1]: Initialize the crtc component */
> > +	crtc = vkms_crtc_init(vkmsdev, &primary->base,
> > +			      cursor ? &cursor->base : NULL);
> > +	if (IS_ERR(crtc))
> > +		return PTR_ERR(crtc);
> > +
> > +	/* Enable the output's CRTC for all the planes */
> > +	drm_for_each_plane(plane, &vkmsdev->drm) {
> > +		plane->possible_crtcs |= drm_crtc_mask(&crtc->base);
> > +	}
> > +
> > +	/* Initialize the connector component */
> > +	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> > +	if (!connector)
> > +		return -ENOMEM;
> > +
> > +	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> > +				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
> > +	if (ret) {
> > +		DRM_ERROR("Failed to init connector\n");
> > +		return ret;
> > +	}
> > +
> > +	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> > +
> > +	/* Initialize the encoder component */
> > +	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
> > +	if (!encoder)
> > +		return -ENOMEM;
> > +
> > +	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> > +				DRM_MODE_ENCODER_VIRTUAL, NULL);
> > +	if (ret) {
> > +		DRM_ERROR("Failed to init encoder\n");
> > +		return ret;
> > +	}
> > +
> > +	encoder->possible_crtcs = drm_crtc_mask(&crtc->base);
> > +
> > +	/* Attach the encoder and the connector */
> > +	ret = drm_connector_attach_encoder(connector, encoder);
> > +	if (ret) {
> > +		DRM_ERROR("Failed to attach connector to encoder\n");
> > +		return ret;
> > +	}
> > +
> > +	/* Initialize the writeback component */
> > +	if (vkmsdev->config->writeback) {
> > +		writeback = vkms_enable_writeback_connector(vkmsdev, crtc);
> > +		if (writeback)
> > +			DRM_ERROR("Failed to init writeback connector\n");
> > +	}
> > +
> > +	drm_mode_config_reset(dev);
> > +
> > +	return 0;
> > +}
> > +
> >  static int vkms_modeset_init(struct vkms_device *vkmsdev)
> >  {
> >  	struct drm_device *dev = &vkmsdev->drm;
> > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h
> > index 2c9d1f20ce84..08d0ef106e37 100644
> > --- a/drivers/gpu/drm/vkms/vkms_drv.h
> > +++ b/drivers/gpu/drm/vkms/vkms_drv.h
> > @@ -25,35 +25,6 @@
> >  
> >  #define VKMS_LUT_SIZE 256
> >  
> > -/**
> > - * struct vkms_output - Internal representation of all output components in vkms
> > - *
> > - * @crtc: Base crtc in drm
> > - * @encoder: DRM encoder used for this output
> > - * @connector: DRM connector used for this output
> > - * @wb_connecter: DRM writeback connector used for this output
> > - * @vblank_hrtimer:
> > - * @period_ns:
> > - * @composer_workq: Ordered workqueue for composer_work
> > - * @lock: Lock used to project concurrent acces to the composer
> > - * @composer_enabled: Protected by @lock.
> > - * @composer_state:
> > - * @composer_lock: Lock used internally to protect @composer_state members
> > - */
> > -struct vkms_output {
> > -	struct drm_crtc crtc;
> > -	struct drm_writeback_connector wb_connector;
> > -	struct hrtimer vblank_hrtimer;
> > -	ktime_t period_ns;
> > -	struct workqueue_struct *composer_workq;
> > -	spinlock_t lock;
> > -
> > -	bool composer_enabled;
> > -	struct vkms_crtc_state *composer_state;
> > -
> > -	spinlock_t composer_lock;
> > -};
> > -
> >  /**
> >   * struct vkms_config - General configuration for VKMS driver
> >   *
> > @@ -80,7 +51,6 @@ struct vkms_config {
> >  struct vkms_device {
> >  	struct drm_device drm;
> >  	struct platform_device *platform;
> > -	struct vkms_output output;
> >  	const struct vkms_config *config;
> >  };
> >  
> > @@ -88,20 +58,7 @@ struct vkms_device {
> >   * The following helpers are used to convert a member of a struct into its parent.
> >   */
> >  
> > -#define drm_crtc_to_vkms_output(target) \
> > -	container_of(target, struct vkms_output, crtc)
> > -
> >  #define drm_device_to_vkms_device(target) \
> >  	container_of(target, struct vkms_device, drm)
> >  
> > -/**
> > - * vkms_output_init() - Initialize all sub-components needed for a vkms device.
> > - *
> > - * @vkmsdev: vkms device to initialize
> > - * @possible_crtc_index: Crtc which can be attached to the planes. The caller must ensure that
> > - * possible_crtc_index is positive and less or equals to 31.
> > - */
> > -
> > -int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index);
> > -
> >  #endif /* _VKMS_DRV_H_ */
> > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> > deleted file mode 100644
> > index cb8507917b5f..000000000000
> > --- a/drivers/gpu/drm/vkms/vkms_output.c
> > +++ /dev/null
> > @@ -1,135 +0,0 @@
> > -// SPDX-License-Identifier: GPL-2.0+
> > -
> > -#include <drm/drm_atomic_helper.h>
> > -#include <drm/drm_edid.h>
> > -#include <drm/drm_probe_helper.h>
> > -#include <drm/drm_managed.h>
> > -
> > -#include "vkms_writeback.h"
> > -#include "vkms_plane.h"
> > -#include "vkms_crtc.h"
> > -
> > -static const struct drm_connector_funcs vkms_connector_funcs = {
> > -	.fill_modes = drm_helper_probe_single_connector_modes,
> > -	.reset = drm_atomic_helper_connector_reset,
> > -	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> > -	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> > -};
> > -
> > -static const struct drm_encoder_funcs vkms_encoder_funcs = {};
> > -
> > -static int vkms_conn_get_modes(struct drm_connector *connector)
> > -{
> > -	int count;
> > -
> > -	/* Use the default modes list from drm */
> > -	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
> > -	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
> > -
> > -	return count;
> > -}
> > -
> > -static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
> > -	.get_modes    = vkms_conn_get_modes,
> > -};
> > -
> > -static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int possible_crtc_index,
> > -				  struct drm_crtc *crtc)
> > -{
> > -	struct vkms_plane *overlay;
> > -
> > -	overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, possible_crtc_index);
> > -	if (IS_ERR(overlay))
> > -		return PTR_ERR(overlay);
> > -
> > -	if (!overlay->base.possible_crtcs)
> > -		overlay->base.possible_crtcs = drm_crtc_mask(crtc);
> > -
> > -	return 0;
> > -}
> > -
> > -int vkms_output_init(struct vkms_device *vkmsdev, int possible_crtc_index)
> > -{
> > -	struct vkms_output *output = &vkmsdev->output;
> > -	struct drm_device *dev = &vkmsdev->drm;
> > -	struct drm_connector *connector;
> > -	struct drm_encoder *encoder;
> > -	struct drm_crtc *crtc = &output->crtc;
> > -	struct vkms_plane *primary, *cursor = NULL;
> > -	int ret;
> > -	int writeback;
> > -	unsigned int n;
> > -
> > -	/*
> > -	 * Initialize used plane. One primary plane is required to perform the composition.
> > -	 *
> > -	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
> > -	 * composition.
> > -	 */
> > -	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, possible_crtc_index);
> > -	if (IS_ERR(primary))
> > -		return PTR_ERR(primary);
> > -
> > -	if (vkmsdev->config->overlay) {
> > -		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
> > -			ret = vkms_add_overlay_plane(vkmsdev, possible_crtc_index, crtc);
> > -			if (ret)
> > -				return ret;
> > -		}
> > -	}
> > -
> > -	if (vkmsdev->config->cursor) {
> > -		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, possible_crtc_index);
> > -		if (IS_ERR(cursor))
> > -			return PTR_ERR(cursor);
> > -	}
> > -
> > -	ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base);
> > -	if (ret)
> > -		return ret;
> > -
> > -	connector = drmm_kzalloc(&vkmsdev->drm, sizeof(*connector), GFP_KERNEL);
> > -	if (!connector)
> > -		return -ENOMEM;
> > -
> > -	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,
> > -				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);
> > -	if (ret) {
> > -		DRM_ERROR("Failed to init connector\n");
> > -		return ret;
> > -	}
> > -
> > -	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
> > -
> > -	encoder = drmm_kzalloc(&vkmsdev->drm, sizeof(*encoder), GFP_KERNEL);
> > -	if (!encoder)
> > -		return -ENOMEM;
> > -
> > -	ret = drmm_encoder_init(dev, encoder, &vkms_encoder_funcs,
> > -				DRM_MODE_ENCODER_VIRTUAL, NULL);
> > -	if (ret) {
> > -		DRM_ERROR("Failed to init encoder\n");
> > -		return ret;
> > -	}
> > -	/*
> > -	 * This is an hardcoded value to select crtc for the encoder.
> > -	 * 1 here designate the first registered CRTC, the one allocated in [1]
> > -	 */
> > -	encoder->possible_crtcs = 1;
> > -
> > -	ret = drm_connector_attach_encoder(connector, encoder);
> > -	if (ret) {
> > -		DRM_ERROR("Failed to attach connector to encoder\n");
> > -		return ret;
> > -	}
> > -
> > -	if (vkmsdev->config->writeback) {
> > -		writeback = vkms_enable_writeback_connector(vkmsdev);
> > -		if (writeback)
> > -			DRM_ERROR("Failed to init writeback connector\n");
> > -	}
> > -
> > -	drm_mode_config_reset(dev);
> > -
> > -	return 0;
> > -}
> > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
> > index 5e75880a5845..322e247979b2 100644
> > --- a/drivers/gpu/drm/vkms/vkms_writeback.c
> > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c
> > @@ -110,7 +110,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
> >  				struct drm_writeback_job *job)
> >  {
> >  	struct vkms_writeback_job *vkmsjob = job->priv;
> > -	struct vkms_device *vkmsdev;
> > +	struct vkms_crtc *vkms_crtc = container_of(connector, struct vkms_crtc, wb_connector);
> >  
> >  	if (!job->fb)
> >  		return;
> > @@ -119,8 +119,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,
> >  
> >  	drm_framebuffer_put(vkmsjob->wb_frame_info.fb);
> >  
> > -	vkmsdev = drm_device_to_vkms_device(job->fb->dev);
> > -	vkms_set_composer(&vkmsdev->output, false);
> > +	vkms_set_composer(vkms_crtc, false);
> >  	kfree(vkmsjob);
> >  }
> >  
> > @@ -129,10 +128,8 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
> >  {
> >  	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
> >  											 conn);
> > -	struct vkms_device *vkmsdev = drm_device_to_vkms_device(conn->dev);
> > -	struct vkms_output *output = &vkmsdev->output;
> > +	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(connector_state->crtc);
> >  	struct drm_writeback_connector *wb_conn = &output->wb_connector;
> > -	struct drm_connector_state *conn_state = wb_conn->base.state;
> >  	struct vkms_crtc_state *crtc_state = output->composer_state;
> >  	struct drm_framebuffer *fb = connector_state->writeback_job->fb;
> >  	u16 crtc_height = crtc_state->base.crtc->mode.vdisplay;
> > @@ -141,12 +138,12 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
> >  	struct vkms_frame_info *wb_frame_info;
> >  	u32 wb_format = fb->format->format;
> >  
> > -	if (!conn_state)
> > +	if (!connector_state)
> >  		return;
> >  
> > -	vkms_set_composer(&vkmsdev->output, true);
> > +	vkms_set_composer(output, true);
> >  
> > -	active_wb = conn_state->writeback_job->priv;
> > +	active_wb = connector_state->writeback_job->priv;
> >  	wb_frame_info = &active_wb->wb_frame_info;
> >  
> >  	spin_lock_irq(&output->composer_lock);
> > @@ -167,9 +164,10 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = {
> >  	.atomic_check = vkms_wb_atomic_check,
> >  };
> >  
> > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev)
> > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,
> > +				    struct vkms_crtc *vkms_crtc)
> >  {
> > -	struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector;
> > +	struct drm_writeback_connector *wb = &vkms_crtc->wb_connector;
> >  
> >  	drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs);
> >  
> > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.h b/drivers/gpu/drm/vkms/vkms_writeback.h
> > index 44dff15faff6..39613a2408be 100644
> > --- a/drivers/gpu/drm/vkms/vkms_writeback.h
> > +++ b/drivers/gpu/drm/vkms/vkms_writeback.h
> > @@ -16,6 +16,6 @@ struct vkms_writeback_job {
> >  };
> >  
> >  /* Writeback */
> > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev);
> > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct vkms_crtc *vkms_crtc);
> >  
> >  #endif //_VKMS_WRITEBACK_H

[PATCH RFC 4/4] drm/vkms: Rename all vkms_crtc instance to be consistent

[Louis Chauvet]

To avoid inconsistency in the VKMS code, rename all struct vkms_crtc
instances to vkms_crtc. This should not change the behavior of the driver.

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
 drivers/gpu/drm/vkms/vkms_composer.c  | 30 ++++++++++----------
 drivers/gpu/drm/vkms/vkms_composer.h  |  2 +-
 drivers/gpu/drm/vkms/vkms_crtc.c      | 52 +++++++++++++++++------------------
 drivers/gpu/drm/vkms/vkms_writeback.c | 12 ++++----
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index 9b2f578c2eb1..4376900b4986 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -515,13 +515,13 @@ void vkms_composer_worker(struct work_struct *work)
 							  composer_work);
 	struct drm_crtc *crtc = crtc_state->base.crtc;
 	struct vkms_writeback_job *active_wb = crtc_state->active_writeback;
-	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 	bool crc_pending, wb_pending;
 	u64 frame_start, frame_end;
 	u32 crc32 = 0;
 	int ret;
 
-	spin_lock_irq(&out->composer_lock);
+	spin_lock_irq(&vkms_crtc->composer_lock);
 	frame_start = crtc_state->frame_start;
 	frame_end = crtc_state->frame_end;
 	crc_pending = crtc_state->crc_pending;
@@ -545,7 +545,7 @@ void vkms_composer_worker(struct work_struct *work)
 		crtc_state->gamma_lut.base = NULL;
 	}
 
-	spin_unlock_irq(&out->composer_lock);
+	spin_unlock_irq(&vkms_crtc->composer_lock);
 
 	/*
 	 * We raced with the vblank hrtimer and previous work already computed
@@ -563,10 +563,10 @@ void vkms_composer_worker(struct work_struct *work)
 		return;
 
 	if (wb_pending) {
-		drm_writeback_signal_completion(&out->wb_connector, 0);
-		spin_lock_irq(&out->composer_lock);
+		drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0);
+		spin_lock_irq(&vkms_crtc->composer_lock);
 		crtc_state->wb_pending = false;
-		spin_unlock_irq(&out->composer_lock);
+		spin_unlock_irq(&vkms_crtc->composer_lock);
 	}
 
 	/*
@@ -616,31 +616,31 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
 	return 0;
 }
 
-void vkms_set_composer(struct vkms_crtc *out, bool enabled)
+void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled)
 {
 	bool old_enabled;
 
 	if (enabled)
-		drm_crtc_vblank_get(&out->base);
+		drm_crtc_vblank_get(&vkms_crtc->base);
 
-	spin_lock_irq(&out->lock);
-	old_enabled = out->composer_enabled;
-	out->composer_enabled = enabled;
-	spin_unlock_irq(&out->lock);
+	spin_lock_irq(&vkms_crtc->lock);
+	old_enabled = vkms_crtc->composer_enabled;
+	vkms_crtc->composer_enabled = enabled;
+	spin_unlock_irq(&vkms_crtc->lock);
 
 	if (old_enabled)
-		drm_crtc_vblank_put(&out->base);
+		drm_crtc_vblank_put(&vkms_crtc->base);
 }
 
 int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
 {
-	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 	bool enabled = false;
 	int ret = 0;
 
 	ret = vkms_crc_parse_source(src_name, &enabled);
 
-	vkms_set_composer(out, enabled);
+	vkms_set_composer(vkms_crtc, enabled);
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
index 77efd2e3a63a..5a676b9960aa 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.h
+++ b/drivers/gpu/drm/vkms/vkms_composer.h
@@ -7,7 +7,7 @@
 #include "vkms_crtc.h"
 
 void vkms_composer_worker(struct work_struct *work);
-void vkms_set_composer(struct vkms_crtc *out, bool enabled);
+void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled);
 
 /* CRC Support */
 const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count);
diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
index 47e62fb3e404..6f6d3118b2f2 100644
--- a/drivers/gpu/drm/vkms/vkms_crtc.c
+++ b/drivers/gpu/drm/vkms/vkms_crtc.c
@@ -16,34 +16,34 @@
 
 static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 {
-	struct vkms_crtc *output = hrtimer_to_vkms_crtc(timer);
-	struct drm_crtc *crtc = &output->base;
+	struct vkms_crtc *vkms_crtc = hrtimer_to_vkms_crtc(timer);
+	struct drm_crtc *crtc = &vkms_crtc->base;
 	struct vkms_crtc_state *state;
 	u64 ret_overrun;
 	bool ret, fence_cookie;
 
 	fence_cookie = dma_fence_begin_signalling();
 
-	ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer,
-					  output->period_ns);
+	ret_overrun = hrtimer_forward_now(&vkms_crtc->vblank_hrtimer,
+					  vkms_crtc->period_ns);
 	if (ret_overrun != 1)
 		pr_warn("%s: vblank timer overrun\n", __func__);
 
-	spin_lock(&output->lock);
+	spin_lock(&vkms_crtc->lock);
 	ret = drm_crtc_handle_vblank(crtc);
 	if (!ret)
 		DRM_ERROR("vkms failure on handling vblank");
 
-	state = output->composer_state;
-	spin_unlock(&output->lock);
+	state = vkms_crtc->composer_state;
+	spin_unlock(&vkms_crtc->lock);
 
-	if (state && output->composer_enabled) {
+	if (state && vkms_crtc->composer_enabled) {
 		u64 frame = drm_crtc_accurate_vblank_count(crtc);
 
 		/* update frame_start only if a queued vkms_composer_worker()
 		 * has read the data
 		 */
-		spin_lock(&output->composer_lock);
+		spin_lock(&vkms_crtc->composer_lock);
 		if (!state->crc_pending)
 			state->frame_start = frame;
 		else
@@ -51,9 +51,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
 					 state->frame_start, frame);
 		state->frame_end = frame;
 		state->crc_pending = true;
-		spin_unlock(&output->composer_lock);
+		spin_unlock(&vkms_crtc->composer_lock);
 
-		ret = queue_work(output->composer_workq, &state->composer_work);
+		ret = queue_work(vkms_crtc->composer_workq, &state->composer_work);
 		if (!ret)
 			DRM_DEBUG_DRIVER("Composer worker already queued\n");
 	}
@@ -67,23 +67,23 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
 	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
-	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 
 	drm_calc_timestamping_constants(crtc, &crtc->mode);
 
-	hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	out->vblank_hrtimer.function = &vkms_vblank_simulate;
-	out->period_ns = ktime_set(0, vblank->framedur_ns);
-	hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL);
+	hrtimer_init(&vkms_crtc->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+	vkms_crtc->vblank_hrtimer.function = &vkms_vblank_simulate;
+	vkms_crtc->period_ns = ktime_set(0, vblank->framedur_ns);
+	hrtimer_start(&vkms_crtc->vblank_hrtimer, vkms_crtc->period_ns, HRTIMER_MODE_REL);
 
 	return 0;
 }
 
 static void vkms_disable_vblank(struct drm_crtc *crtc)
 {
-	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 
-	hrtimer_cancel(&out->vblank_hrtimer);
+	hrtimer_cancel(&vkms_crtc->vblank_hrtimer);
 }
 
 static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
@@ -91,7 +91,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
 				      bool in_vblank_irq)
 {
 	struct drm_device *dev = crtc->dev;
-	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
 
 	if (!READ_ONCE(vblank->enabled)) {
@@ -99,7 +99,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
 		return true;
 	}
 
-	*vblank_time = READ_ONCE(output->vblank_hrtimer.node.expires);
+	*vblank_time = READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires);
 
 	if (WARN_ON(*vblank_time == vblank->time))
 		return true;
@@ -111,7 +111,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
 	 * the vblank core expects. Therefore we need to always correct the
 	 * timestampe by one frame.
 	 */
-	*vblank_time -= output->period_ns;
+	*vblank_time -= vkms_crtc->period_ns;
 
 	return true;
 }
@@ -235,18 +235,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
 static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
 				   struct drm_atomic_state *state)
 {
-	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 
 	/* This lock is held across the atomic commit to block vblank timer
 	 * from scheduling vkms_composer_worker until the composer is updated
 	 */
-	spin_lock_irq(&vkms_output->lock);
+	spin_lock_irq(&vkms_crtc->lock);
 }
 
 static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
 				   struct drm_atomic_state *state)
 {
-	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
 
 	if (crtc->state->event) {
 		spin_lock(&crtc->dev->event_lock);
@@ -261,9 +261,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
 		crtc->state->event = NULL;
 	}
 
-	vkms_output->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
+	vkms_crtc->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
 
-	spin_unlock_irq(&vkms_output->lock);
+	spin_unlock_irq(&vkms_crtc->lock);
 }
 
 static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
index 322e247979b2..69c710f21e57 100644
--- a/drivers/gpu/drm/vkms/vkms_writeback.c
+++ b/drivers/gpu/drm/vkms/vkms_writeback.c
@@ -128,9 +128,9 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
 {
 	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
 											 conn);
-	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(connector_state->crtc);
-	struct drm_writeback_connector *wb_conn = &output->wb_connector;
-	struct vkms_crtc_state *crtc_state = output->composer_state;
+	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(connector_state->crtc);
+	struct drm_writeback_connector *wb_conn = &vkms_crtc->wb_connector;
+	struct vkms_crtc_state *crtc_state = vkms_crtc->composer_state;
 	struct drm_framebuffer *fb = connector_state->writeback_job->fb;
 	u16 crtc_height = crtc_state->base.crtc->mode.vdisplay;
 	u16 crtc_width = crtc_state->base.crtc->mode.hdisplay;
@@ -141,15 +141,15 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
 	if (!connector_state)
 		return;
 
-	vkms_set_composer(output, true);
+	vkms_set_composer(vkms_crtc, true);
 
 	active_wb = connector_state->writeback_job->priv;
 	wb_frame_info = &active_wb->wb_frame_info;
 
-	spin_lock_irq(&output->composer_lock);
+	spin_lock_irq(&vkms_crtc->composer_lock);
 	crtc_state->active_writeback = active_wb;
 	crtc_state->wb_pending = true;
-	spin_unlock_irq(&output->composer_lock);
+	spin_unlock_irq(&vkms_crtc->composer_lock);
 	drm_writeback_queue_job(wb_conn, connector_state);
 	active_wb->pixel_write = get_pixel_write_line_function(wb_format);
 	drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height);

-- 
2.44.2

[PATCH RFC 4/4] drm/vkms: Rename all vkms_crtc instance to be

[José Expósito]

I love how you made this an extra patch. I should have done the same thing in my
configfs series to reduce the diff :)

> To avoid inconsistency in the VKMS code, rename all struct vkms_crtc
> instances to vkms_crtc. This should not change the behavior of the driver.
> 
> Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>

Reviewed-by: José Expósito <jose.exposito89@gmail.com>

> ---
>  drivers/gpu/drm/vkms/vkms_composer.c  | 30 ++++++++++----------
>  drivers/gpu/drm/vkms/vkms_composer.h  |  2 +-
>  drivers/gpu/drm/vkms/vkms_crtc.c      | 52 +++++++++++++++++------------------
>  drivers/gpu/drm/vkms/vkms_writeback.c | 12 ++++----
>  4 files changed, 48 insertions(+), 48 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
> index 9b2f578c2eb1..4376900b4986 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.c
> +++ b/drivers/gpu/drm/vkms/vkms_composer.c
> @@ -515,13 +515,13 @@ void vkms_composer_worker(struct work_struct *work)
>  							  composer_work);
>  	struct drm_crtc *crtc = crtc_state->base.crtc;
>  	struct vkms_writeback_job *active_wb = crtc_state->active_writeback;
> -	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  	bool crc_pending, wb_pending;
>  	u64 frame_start, frame_end;
>  	u32 crc32 = 0;
>  	int ret;
>  
> -	spin_lock_irq(&out->composer_lock);
> +	spin_lock_irq(&vkms_crtc->composer_lock);
>  	frame_start = crtc_state->frame_start;
>  	frame_end = crtc_state->frame_end;
>  	crc_pending = crtc_state->crc_pending;
> @@ -545,7 +545,7 @@ void vkms_composer_worker(struct work_struct *work)
>  		crtc_state->gamma_lut.base = NULL;
>  	}
>  
> -	spin_unlock_irq(&out->composer_lock);
> +	spin_unlock_irq(&vkms_crtc->composer_lock);
>  
>  	/*
>  	 * We raced with the vblank hrtimer and previous work already computed
> @@ -563,10 +563,10 @@ void vkms_composer_worker(struct work_struct *work)
>  		return;
>  
>  	if (wb_pending) {
> -		drm_writeback_signal_completion(&out->wb_connector, 0);
> -		spin_lock_irq(&out->composer_lock);
> +		drm_writeback_signal_completion(&vkms_crtc->wb_connector, 0);
> +		spin_lock_irq(&vkms_crtc->composer_lock);
>  		crtc_state->wb_pending = false;
> -		spin_unlock_irq(&out->composer_lock);
> +		spin_unlock_irq(&vkms_crtc->composer_lock);
>  	}
>  
>  	/*
> @@ -616,31 +616,31 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *src_name,
>  	return 0;
>  }
>  
> -void vkms_set_composer(struct vkms_crtc *out, bool enabled)
> +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled)
>  {
>  	bool old_enabled;
>  
>  	if (enabled)
> -		drm_crtc_vblank_get(&out->base);
> +		drm_crtc_vblank_get(&vkms_crtc->base);
>  
> -	spin_lock_irq(&out->lock);
> -	old_enabled = out->composer_enabled;
> -	out->composer_enabled = enabled;
> -	spin_unlock_irq(&out->lock);
> +	spin_lock_irq(&vkms_crtc->lock);
> +	old_enabled = vkms_crtc->composer_enabled;
> +	vkms_crtc->composer_enabled = enabled;
> +	spin_unlock_irq(&vkms_crtc->lock);
>  
>  	if (old_enabled)
> -		drm_crtc_vblank_put(&out->base);
> +		drm_crtc_vblank_put(&vkms_crtc->base);
>  }
>  
>  int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
>  {
> -	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  	bool enabled = false;
>  	int ret = 0;
>  
>  	ret = vkms_crc_parse_source(src_name, &enabled);
>  
> -	vkms_set_composer(out, enabled);
> +	vkms_set_composer(vkms_crtc, enabled);
>  
>  	return ret;
>  }
> diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
> index 77efd2e3a63a..5a676b9960aa 100644
> --- a/drivers/gpu/drm/vkms/vkms_composer.h
> +++ b/drivers/gpu/drm/vkms/vkms_composer.h
> @@ -7,7 +7,7 @@
>  #include "vkms_crtc.h"
>  
>  void vkms_composer_worker(struct work_struct *work);
> -void vkms_set_composer(struct vkms_crtc *out, bool enabled);
> +void vkms_set_composer(struct vkms_crtc *vkms_crtc, bool enabled);
>  
>  /* CRC Support */
>  const char *const *vkms_get_crc_sources(struct drm_crtc *crtc, size_t *count);
> diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c
> index 47e62fb3e404..6f6d3118b2f2 100644
> --- a/drivers/gpu/drm/vkms/vkms_crtc.c
> +++ b/drivers/gpu/drm/vkms/vkms_crtc.c
> @@ -16,34 +16,34 @@
>  
>  static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
>  {
> -	struct vkms_crtc *output = hrtimer_to_vkms_crtc(timer);
> -	struct drm_crtc *crtc = &output->base;
> +	struct vkms_crtc *vkms_crtc = hrtimer_to_vkms_crtc(timer);
> +	struct drm_crtc *crtc = &vkms_crtc->base;
>  	struct vkms_crtc_state *state;
>  	u64 ret_overrun;
>  	bool ret, fence_cookie;
>  
>  	fence_cookie = dma_fence_begin_signalling();
>  
> -	ret_overrun = hrtimer_forward_now(&output->vblank_hrtimer,
> -					  output->period_ns);
> +	ret_overrun = hrtimer_forward_now(&vkms_crtc->vblank_hrtimer,
> +					  vkms_crtc->period_ns);
>  	if (ret_overrun != 1)
>  		pr_warn("%s: vblank timer overrun\n", __func__);
>  
> -	spin_lock(&output->lock);
> +	spin_lock(&vkms_crtc->lock);
>  	ret = drm_crtc_handle_vblank(crtc);
>  	if (!ret)
>  		DRM_ERROR("vkms failure on handling vblank");
>  
> -	state = output->composer_state;
> -	spin_unlock(&output->lock);
> +	state = vkms_crtc->composer_state;
> +	spin_unlock(&vkms_crtc->lock);
>  
> -	if (state && output->composer_enabled) {
> +	if (state && vkms_crtc->composer_enabled) {
>  		u64 frame = drm_crtc_accurate_vblank_count(crtc);
>  
>  		/* update frame_start only if a queued vkms_composer_worker()
>  		 * has read the data
>  		 */
> -		spin_lock(&output->composer_lock);
> +		spin_lock(&vkms_crtc->composer_lock);
>  		if (!state->crc_pending)
>  			state->frame_start = frame;
>  		else
> @@ -51,9 +51,9 @@ static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer)
>  					 state->frame_start, frame);
>  		state->frame_end = frame;
>  		state->crc_pending = true;
> -		spin_unlock(&output->composer_lock);
> +		spin_unlock(&vkms_crtc->composer_lock);
>  
> -		ret = queue_work(output->composer_workq, &state->composer_work);
> +		ret = queue_work(vkms_crtc->composer_workq, &state->composer_work);
>  		if (!ret)
>  			DRM_DEBUG_DRIVER("Composer worker already queued\n");
>  	}
> @@ -67,23 +67,23 @@ static int vkms_enable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *dev = crtc->dev;
>  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
> -	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  
>  	drm_calc_timestamping_constants(crtc, &crtc->mode);
>  
> -	hrtimer_init(&out->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> -	out->vblank_hrtimer.function = &vkms_vblank_simulate;
> -	out->period_ns = ktime_set(0, vblank->framedur_ns);
> -	hrtimer_start(&out->vblank_hrtimer, out->period_ns, HRTIMER_MODE_REL);
> +	hrtimer_init(&vkms_crtc->vblank_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
> +	vkms_crtc->vblank_hrtimer.function = &vkms_vblank_simulate;
> +	vkms_crtc->period_ns = ktime_set(0, vblank->framedur_ns);
> +	hrtimer_start(&vkms_crtc->vblank_hrtimer, vkms_crtc->period_ns, HRTIMER_MODE_REL);
>  
>  	return 0;
>  }
>  
>  static void vkms_disable_vblank(struct drm_crtc *crtc)
>  {
> -	struct vkms_crtc *out = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  
> -	hrtimer_cancel(&out->vblank_hrtimer);
> +	hrtimer_cancel(&vkms_crtc->vblank_hrtimer);
>  }
>  
>  static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
> @@ -91,7 +91,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
>  				      bool in_vblank_irq)
>  {
>  	struct drm_device *dev = crtc->dev;
> -	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
>  
>  	if (!READ_ONCE(vblank->enabled)) {
> @@ -99,7 +99,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
>  		return true;
>  	}
>  
> -	*vblank_time = READ_ONCE(output->vblank_hrtimer.node.expires);
> +	*vblank_time = READ_ONCE(vkms_crtc->vblank_hrtimer.node.expires);
>  
>  	if (WARN_ON(*vblank_time == vblank->time))
>  		return true;
> @@ -111,7 +111,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc,
>  	 * the vblank core expects. Therefore we need to always correct the
>  	 * timestampe by one frame.
>  	 */
> -	*vblank_time -= output->period_ns;
> +	*vblank_time -= vkms_crtc->period_ns;
>  
>  	return true;
>  }
> @@ -235,18 +235,18 @@ static void vkms_crtc_atomic_disable(struct drm_crtc *crtc,
>  static void vkms_crtc_atomic_begin(struct drm_crtc *crtc,
>  				   struct drm_atomic_state *state)
>  {
> -	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  
>  	/* This lock is held across the atomic commit to block vblank timer
>  	 * from scheduling vkms_composer_worker until the composer is updated
>  	 */
> -	spin_lock_irq(&vkms_output->lock);
> +	spin_lock_irq(&vkms_crtc->lock);
>  }
>  
>  static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
>  				   struct drm_atomic_state *state)
>  {
> -	struct vkms_crtc *vkms_output = drm_crtc_to_vkms_crtc(crtc);
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(crtc);
>  
>  	if (crtc->state->event) {
>  		spin_lock(&crtc->dev->event_lock);
> @@ -261,9 +261,9 @@ static void vkms_crtc_atomic_flush(struct drm_crtc *crtc,
>  		crtc->state->event = NULL;
>  	}
>  
> -	vkms_output->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
> +	vkms_crtc->composer_state = drm_crtc_state_to_vkms_crtc_state(crtc->state);
>  
> -	spin_unlock_irq(&vkms_output->lock);
> +	spin_unlock_irq(&vkms_crtc->lock);
>  }
>  
>  static const struct drm_crtc_helper_funcs vkms_crtc_helper_funcs = {
> diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c
> index 322e247979b2..69c710f21e57 100644
> --- a/drivers/gpu/drm/vkms/vkms_writeback.c
> +++ b/drivers/gpu/drm/vkms/vkms_writeback.c
> @@ -128,9 +128,9 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
>  {
>  	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,
>  											 conn);
> -	struct vkms_crtc *output = drm_crtc_to_vkms_crtc(connector_state->crtc);
> -	struct drm_writeback_connector *wb_conn = &output->wb_connector;
> -	struct vkms_crtc_state *crtc_state = output->composer_state;
> +	struct vkms_crtc *vkms_crtc = drm_crtc_to_vkms_crtc(connector_state->crtc);
> +	struct drm_writeback_connector *wb_conn = &vkms_crtc->wb_connector;
> +	struct vkms_crtc_state *crtc_state = vkms_crtc->composer_state;
>  	struct drm_framebuffer *fb = connector_state->writeback_job->fb;
>  	u16 crtc_height = crtc_state->base.crtc->mode.vdisplay;
>  	u16 crtc_width = crtc_state->base.crtc->mode.hdisplay;
> @@ -141,15 +141,15 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,
>  	if (!connector_state)
>  		return;
>  
> -	vkms_set_composer(output, true);
> +	vkms_set_composer(vkms_crtc, true);
>  
>  	active_wb = connector_state->writeback_job->priv;
>  	wb_frame_info = &active_wb->wb_frame_info;
>  
> -	spin_lock_irq(&output->composer_lock);
> +	spin_lock_irq(&vkms_crtc->composer_lock);
>  	crtc_state->active_writeback = active_wb;
>  	crtc_state->wb_pending = true;
> -	spin_unlock_irq(&output->composer_lock);
> +	spin_unlock_irq(&vkms_crtc->composer_lock);
>  	drm_writeback_queue_job(wb_conn, connector_state);
>  	active_wb->pixel_write = get_pixel_write_line_function(wb_format);
>  	drm_rect_init(&wb_frame_info->src, 0, 0, crtc_width, crtc_height);