[PATCH 0/2] drm/vkms: A couple of trivial cleanups

[PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Javier Martinez Canillas]

Hello,

This series contains two trivial cleanups for the vkms driver.

Patch #1 just gets rid of a wrapper helper that wasn't really adding that
much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
that was only used to call the drm_simple_encoder_init() function helper.

Best regards,
Javier


Javier Martinez Canillas (2):
  drm/vkms: Drop vkms_connector_destroy() wrapper
  drm/vkms: Remove <drm/drm_simple_kms_helper.h> include

 drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c
-- 
2.40.0

[PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Javier Martinez Canillas]

Hello,

This series contains two trivial cleanups for the vkms driver.

Patch #1 just gets rid of a wrapper helper that wasn't really adding that
much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
that was only used to call the drm_simple_encoder_init() function helper.

Best regards,
Javier


Javier Martinez Canillas (2):
  drm/vkms: Drop vkms_connector_destroy() wrapper
  drm/vkms: Remove <drm/drm_simple_kms_helper.h> include

 drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c
-- 
2.40.0

[PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Javier Martinez Canillas]

This helper is just a wrapper that calls drm_connector_cleanup(), there's
no need to have another level of indirection.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 drivers/gpu/drm/vkms/vkms_output.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 991857125bb4..4de6f8ae38be 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -6,14 +6,9 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
 
-static void vkms_connector_destroy(struct drm_connector *connector)
-{
-	drm_connector_cleanup(connector);
-}
-
 static const struct drm_connector_funcs vkms_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
-	.destroy = vkms_connector_destroy,
+	.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,
-- 
2.40.0

[PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Javier Martinez Canillas]

This helper is just a wrapper that calls drm_connector_cleanup(), there's
no need to have another level of indirection.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 drivers/gpu/drm/vkms/vkms_output.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 991857125bb4..4de6f8ae38be 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -6,14 +6,9 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
 
-static void vkms_connector_destroy(struct drm_connector *connector)
-{
-	drm_connector_cleanup(connector);
-}
-
 static const struct drm_connector_funcs vkms_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
-	.destroy = vkms_connector_destroy,
+	.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,
-- 
2.40.0

[PATCH 2/2] drm/vkms: Remove <drm/drm_simple_kms_helper.h> include

[Javier Martinez Canillas]

The driver doesn't use simple-KMS helpers to set a simple display pipeline
but it only uses the drm_simple_encoder_init() helper from simple-KMS that
initializes and encoder.

That helper is just a wrapper of drm_encoder_init(), but passing a struct
drm_encoder_funcs that sets the .destroy handler to drm_encoder_cleanup().

Since the <drm/drm_simple_kms_helper.h> header is only included for this
helper and because the connector is initialized with drm_connector_init()
as well, do the same for the encoder and drop the header include.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 drivers/gpu/drm/vkms/vkms_output.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 4de6f8ae38be..5ce70dd946aa 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -4,7 +4,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drm_simple_kms_helper.h>
 
 static const struct drm_connector_funcs vkms_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -14,6 +13,10 @@ 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 int vkms_conn_get_modes(struct drm_connector *connector)
 {
 	int count;
@@ -86,7 +89,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)
 
 	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
 
-	ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL);
+	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
+			       DRM_MODE_ENCODER_VIRTUAL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to init encoder\n");
 		goto err_encoder;
-- 
2.40.0

[PATCH 2/2] drm/vkms: Remove <drm/drm_simple_kms_helper.h> include

[Javier Martinez Canillas]

The driver doesn't use simple-KMS helpers to set a simple display pipeline
but it only uses the drm_simple_encoder_init() helper from simple-KMS that
initializes and encoder.

That helper is just a wrapper of drm_encoder_init(), but passing a struct
drm_encoder_funcs that sets the .destroy handler to drm_encoder_cleanup().

Since the <drm/drm_simple_kms_helper.h> header is only included for this
helper and because the connector is initialized with drm_connector_init()
as well, do the same for the encoder and drop the header include.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 drivers/gpu/drm/vkms/vkms_output.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 4de6f8ae38be..5ce70dd946aa 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -4,7 +4,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
-#include <drm/drm_simple_kms_helper.h>
 
 static const struct drm_connector_funcs vkms_connector_funcs = {
 	.fill_modes = drm_helper_probe_single_connector_modes,
@@ -14,6 +13,10 @@ 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 int vkms_conn_get_modes(struct drm_connector *connector)
 {
 	int count;
@@ -86,7 +89,8 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)
 
 	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
 
-	ret = drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL);
+	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
+			       DRM_MODE_ENCODER_VIRTUAL, NULL);
 	if (ret) {
 		DRM_ERROR("Failed to init encoder\n");
 		goto err_encoder;
-- 
2.40.0

Re: [PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Daniel Vetter]

On Thu, Apr 06, 2023 at 01:02:34PM +0200, Javier Martinez Canillas wrote:
> This helper is just a wrapper that calls drm_connector_cleanup(), there's
> no need to have another level of indirection.
> 
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

On both patches:

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Aside, would be a nice cleanup to move vkms output stuff (crtc and
connector) over to the drmm_ stuff. The plane already does that.

That should also simplify the multi-output work.
-Daniel

> ---
> 
>  drivers/gpu/drm/vkms/vkms_output.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 991857125bb4..4de6f8ae38be 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -6,14 +6,9 @@
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_simple_kms_helper.h>
>  
> -static void vkms_connector_destroy(struct drm_connector *connector)
> -{
> -	drm_connector_cleanup(connector);
> -}
> -
>  static const struct drm_connector_funcs vkms_connector_funcs = {
>  	.fill_modes = drm_helper_probe_single_connector_modes,
> -	.destroy = vkms_connector_destroy,
> +	.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,
> -- 
> 2.40.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: [PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Daniel Vetter]

On Thu, Apr 06, 2023 at 01:02:34PM +0200, Javier Martinez Canillas wrote:
> This helper is just a wrapper that calls drm_connector_cleanup(), there's
> no need to have another level of indirection.
> 
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

On both patches:

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Aside, would be a nice cleanup to move vkms output stuff (crtc and
connector) over to the drmm_ stuff. The plane already does that.

That should also simplify the multi-output work.
-Daniel

> ---
> 
>  drivers/gpu/drm/vkms/vkms_output.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 991857125bb4..4de6f8ae38be 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -6,14 +6,9 @@
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_simple_kms_helper.h>
>  
> -static void vkms_connector_destroy(struct drm_connector *connector)
> -{
> -	drm_connector_cleanup(connector);
> -}
> -
>  static const struct drm_connector_funcs vkms_connector_funcs = {
>  	.fill_modes = drm_helper_probe_single_connector_modes,
> -	.destroy = vkms_connector_destroy,
> +	.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,
> -- 
> 2.40.0
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1032 bytes --]

Hi

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

for the series.

Best regards
Thomas

Am 06.04.23 um 13:02 schrieb Javier Martinez Canillas:
> Hello,
> 
> This series contains two trivial cleanups for the vkms driver.
> 
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
> 
> Best regards,
> Javier
> 
> 
> Javier Martinez Canillas (2):
>    drm/vkms: Drop vkms_connector_destroy() wrapper
>    drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
> 
>   drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> 
> base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1032 bytes --]

Hi

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

for the series.

Best regards
Thomas

Am 06.04.23 um 13:02 schrieb Javier Martinez Canillas:
> Hello,
> 
> This series contains two trivial cleanups for the vkms driver.
> 
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
> 
> Best regards,
> Javier
> 
> 
> Javier Martinez Canillas (2):
>    drm/vkms: Drop vkms_connector_destroy() wrapper
>    drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
> 
>   drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> 
> base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Maíra Canal]

On 4/6/23 08:11, Daniel Vetter wrote:
> On Thu, Apr 06, 2023 at 01:02:34PM +0200, Javier Martinez Canillas wrote:
>> This helper is just a wrapper that calls drm_connector_cleanup(), there's
>> no need to have another level of indirection.
>>
>> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
> 
> On both patches:
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> Aside, would be a nice cleanup to move vkms output stuff (crtc and
> connector) over to the drmm_ stuff. The plane already does that.

I sent a patch [1] a while ago moving the CRTC to the drmm_ functions.
If you could take a look at it, it would be great.

[1] https://lore.kernel.org/dri-devel/20230116205800.1266227-1-mcanal@igalia.com/T/

Best Regards,
- Maíra Canal

> 
> That should also simplify the multi-output work.
> -Daniel
> 
>> ---
>>
>>   drivers/gpu/drm/vkms/vkms_output.c | 7 +------
>>   1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
>> index 991857125bb4..4de6f8ae38be 100644
>> --- a/drivers/gpu/drm/vkms/vkms_output.c
>> +++ b/drivers/gpu/drm/vkms/vkms_output.c
>> @@ -6,14 +6,9 @@
>>   #include <drm/drm_probe_helper.h>
>>   #include <drm/drm_simple_kms_helper.h>
>>   
>> -static void vkms_connector_destroy(struct drm_connector *connector)
>> -{
>> -	drm_connector_cleanup(connector);
>> -}
>> -
>>   static const struct drm_connector_funcs vkms_connector_funcs = {
>>   	.fill_modes = drm_helper_probe_single_connector_modes,
>> -	.destroy = vkms_connector_destroy,
>> +	.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,
>> -- 
>> 2.40.0
>>
> 

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Maíra Canal]

Hi,

Reviewed-by: Maíra Canal <mcanal@igalia.com>

for the series.

Thanks for helping to cleanup vkms!

Best Regards,
- Maíra Canal

On 4/6/23 08:02, Javier Martinez Canillas wrote:
> Hello,
> 
> This series contains two trivial cleanups for the vkms driver.
> 
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
> 
> Best regards,
> Javier
> 
> 
> Javier Martinez Canillas (2):
>    drm/vkms: Drop vkms_connector_destroy() wrapper
>    drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
> 
>   drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> 
> base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Maíra Canal]

Hi,

Reviewed-by: Maíra Canal <mcanal@igalia.com>

for the series.

Thanks for helping to cleanup vkms!

Best Regards,
- Maíra Canal

On 4/6/23 08:02, Javier Martinez Canillas wrote:
> Hello,
> 
> This series contains two trivial cleanups for the vkms driver.
> 
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
> 
> Best regards,
> Javier
> 
> 
> Javier Martinez Canillas (2):
>    drm/vkms: Drop vkms_connector_destroy() wrapper
>    drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
> 
>   drivers/gpu/drm/vkms/vkms_output.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> 
> base-commit: 77d08a2de6a43521f5a02848f11185b6f46af21c

Re: [PATCH 1/2] drm/vkms: Drop vkms_connector_destroy() wrapper

[Javier Martinez Canillas]

Maíra Canal <mcanal@igalia.com> writes:

Hello Maíra,

> On 4/6/23 08:11, Daniel Vetter wrote:
>> On Thu, Apr 06, 2023 at 01:02:34PM +0200, Javier Martinez Canillas wrote:
>>> This helper is just a wrapper that calls drm_connector_cleanup(), there's
>>> no need to have another level of indirection.
>>>
>>> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
>> 
>> On both patches:
>> 
>> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>> 
>> Aside, would be a nice cleanup to move vkms output stuff (crtc and
>> connector) over to the drmm_ stuff. The plane already does that.
>
> I sent a patch [1] a while ago moving the CRTC to the drmm_ functions.
> If you could take a look at it, it would be great.
>
> [1] https://lore.kernel.org/dri-devel/20230116205800.1266227-1-mcanal@igalia.com/T/
>

I've now reviewed both patches from your series and they look good to me.

> Best Regards,
> - Maíra Canal
>

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Javier Martinez Canillas]

Javier Martinez Canillas <javierm@redhat.com> writes:

> Hello,
>
> This series contains two trivial cleanups for the vkms driver.
>
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
>
> Best regards,
> Javier
>
>
> Javier Martinez Canillas (2):
>   drm/vkms: Drop vkms_connector_destroy() wrapper
>   drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
>

Pushed to drm-misc (drm-misc-next). Thanks!

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

Re: [PATCH 0/2] drm/vkms: A couple of trivial cleanups

[Javier Martinez Canillas]

Javier Martinez Canillas <javierm@redhat.com> writes:

> Hello,
>
> This series contains two trivial cleanups for the vkms driver.
>
> Patch #1 just gets rid of a wrapper helper that wasn't really adding that
> much value and patch #2 drops the <drm/drm_simple_kms_helper.h> header
> that was only used to call the drm_simple_encoder_init() function helper.
>
> Best regards,
> Javier
>
>
> Javier Martinez Canillas (2):
>   drm/vkms: Drop vkms_connector_destroy() wrapper
>   drm/vkms: Remove <drm/drm_simple_kms_helper.h> include
>

Pushed to drm-misc (drm-misc-next). Thanks!

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat