drm/vkms: Switch all vkms object to DRM managed objects
Louis Chauvet
maintainerv8 cover drm/vkms: Switch all vkms object to DRM managed objects
To simplify the memory managment, this series replace all manual drm object managment 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.
No functional changes are intended in this series.
PATCH 1/8: Migrate connector managment to drmm
PATCH 2/8: Migrate encoder managment to drmm
PATCH 3/8: Add helper to allocate workqueue
PATCH 4/8: Migrate CRTC management to drm
PATCH 5/8: Create a helper to initialize drm_writeback_connector (common
part between drmm and normal variants)
PATCH 6/8: Ensure the proper clean of drm_writeback_connector after a
failure during init
PATCH 7/8: Create the drmm initialization for drm_writeback_connector PATCH 8/8: Migrate writeback connector management to drm
For the drmm_writeback helpers, you can find some discussions here [3].
[3]:https://lore.kernel.org/all/[email protected]/
---
Changes in v8:
- Add the helper to allocate workqueue with drmm managment
- Reorder includes
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Add Reviewed-by
- Merge PATCH 4/8 and 5/8 as the function were statics
- PATCH 6/7: Remove optional parameter for encoder
- PATCH 7/7: Create dedicated encoder for vkms writeback connector
- Removed useless cleanup in PATCH 6/8
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- Added R-by
- Splited the drmm_writeback_connector init in multiple commits + rework
how it is done. This time it should not change the behavior of existing
drivers
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Rebased on drm-misc-next
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- No changes for the managed part
- Add the patch to introduce drmm_writeback helpers
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- As suggested by Maxime, split the managed and the dynamic allocation
parts in different series
- To reduce the diff in this series, extract the "remove crtc index" part,
see https://lore.kernel.org/all/[email protected]/
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Applied comments from José
- Extract the rename vkms_output -> vkms_crtc to avoid useless changes in
the last commit
- Extract the rename to_vkms_crtc_state to
drm_crtc_state_to_vkms_crtc_state to avoid useless changes in last
commit
- Extract the drm_mode_crtc_set_gamma_size result check in its own commit
- Rebased on drm-misc/drm-misc-next
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Louis Chauvet (8):
drm/vkms: Switch to managed for connector
drm/vkms: Switch to managed for encoder
drm/managed: Add DRM-managed alloc_ordered_workqueue
drm/vkms: Switch to managed for crtc
drm: writeback: Create an helper for drm_writeback_connector initialization
drm: writeback: Add missing cleanup in case of initialization failure
drm: writeback: Create drmm variants for drm_writeback_connector initialization drm/vkms: Switch to managed for writeback connector
drivers/gpu/drm/drm_managed.c | 8 ++ drivers/gpu/drm/drm_writeback.c | 185 +++++++++++++++++++++++++++++----- drivers/gpu/drm/vkms/vkms_crtc.c | 5 +- drivers/gpu/drm/vkms/vkms_drv.c | 9 -- drivers/gpu/drm/vkms/vkms_drv.h | 3 +- drivers/gpu/drm/vkms/vkms_output.c | 26 ++--- drivers/gpu/drm/vkms/vkms_writeback.c | 21 ++-- include/drm/drm_managed.h | 12 +++ include/drm/drm_writeback.h | 6 ++ 9 files changed, 211 insertions(+), 64 deletions(-)
---
base-commit: 6e11ce84c514f3ad8c8c766e1328bf49d80a0325
change-id: 20240521-google-vkms-managed-4aec99461a77
Best regards,
Signature · 1 line
Louis Chauvet <[email protected]>
Louis Chauvet
maintainerPATCH v8 1/8 drm/vkms: Switch to managed for connector
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.
--- drivers/gpu/drm/vkms/vkms_output.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/vkms/vkms_output.c +4 -8
@@ -3,11 +3,11 @@#include "vkms_drv.h" #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> +#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> 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,
@@ -75,8 +75,8 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } - ret =drm_connector_init (dev, connector, &vkms_connector_funcs, -DRM_MODE_CONNECTOR_VIRTUAL ); + 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;
@@ -88,7 +88,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) DRM_MODE_ENCODER_VIRTUAL, NULL);if (ret) {DRM_ERROR ("Failed to init encoder\n" ); - goto err_encoder; +return ret; } encoder->possible_crtcs =drm_crtc_mask (crtc);
@@ -110,9 +110,5 @@ int vkms_output_init(struct vkms_device *vkmsdev) err_attach:drm_encoder_cleanup (encoder); - -err_encoder: -drm_connector_cleanup (connector); -return ret; }
Signature · 1 line
2.47.1
PATCH v8 1/8 drm/vkms: Switch to managed for connector
Quoted 8 lines
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.
Reviewed-by Maxime Ripard <[email protected]>Reviewed-by Maíra Canal <[email protected]>Reviewed-by Thomas Zimmermann <[email protected]>Signed-off-by Louis Chauvet <[email protected]>
Thanks!
Quoted 52 lines
--- drivers/gpu/drm/vkms/vkms_output.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)drivers/gpu/drm/vkms/vkms_output.c +4
-8@@ -3,11 +3,11 @@#include "vkms_drv.h" #include <drm/drm_atomic_helper.h> #include <drm/drm_edid.h> +#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> 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,@@ -75,8 +75,8 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } - ret =drm_connector_init (dev, connector, &vkms_connector_funcs, -DRM_MODE_CONNECTOR_VIRTUAL ); + 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;@@ -88,7 +88,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) DRM_MODE_ENCODER_VIRTUAL, NULL);if (ret) {DRM_ERROR ("Failed to init encoder\n" ); - goto err_encoder; +return ret; } encoder->possible_crtcs =drm_crtc_mask (crtc);@@ -110,9 +110,5 @@ int vkms_output_init(struct vkms_device *vkmsdev) err_attach:drm_encoder_cleanup (encoder); - -err_encoder: -drm_connector_cleanup (connector); -return ret; }
Louis Chauvet
maintainerPATCH v8 2/8 drm/vkms: Switch to managed for encoder
In reply to Louis ChauvetThe current VKMS driver uses non-managed function to create encoders. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers.
--- drivers/gpu/drm/vkms/vkms_output.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/vkms/vkms_output.c +3 -9
@@ -13,10 +13,6 @@ 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;
@@ -84,8 +80,8 @@ int vkms_output_init(struct vkms_device *vkmsdev)drm_connector_helper_add (connector, &vkms_conn_helper_funcs); - ret =drm_encoder_init (dev, encoder, &vkms_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drmm_encoder_init (dev, encoder,NULL , +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to init encoder\n" );return ret;
@@ -95,7 +91,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) 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) {
@@ -108,7 +104,5 @@ int vkms_output_init(struct vkms_device *vkmsdev)return 0 ; -err_attach: -drm_encoder_cleanup (encoder);return ret; }
Signature · 1 line
2.47.1
PATCH v8 2/8 drm/vkms: Switch to managed for encoder
Quoted 8 lines
The current VKMS driver uses non-managed function to create encoders. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers.
Reviewed-by Maxime Ripard <[email protected]>Reviewed-by Maíra Canal <[email protected]>Reviewed-by Thomas Zimmermann <[email protected]>Signed-off-by Louis Chauvet <[email protected]>
Thanks!
Quoted 48 lines
--- drivers/gpu/drm/vkms/vkms_output.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)drivers/gpu/drm/vkms/vkms_output.c +3
-9@@ -13,10 +13,6 @@ 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;@@ -84,8 +80,8 @@ int vkms_output_init(struct vkms_device *vkmsdev)drm_connector_helper_add (connector, &vkms_conn_helper_funcs); - ret =drm_encoder_init (dev, encoder, &vkms_encoder_funcs, -DRM_MODE_ENCODER_VIRTUAL ,NULL ); + ret =drmm_encoder_init (dev, encoder,NULL , +DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {DRM_ERROR ("Failed to init encoder\n" );return ret;@@ -95,7 +91,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) 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) {@@ -108,7 +104,5 @@ int vkms_output_init(struct vkms_device *vkmsdev)return 0 ; -err_attach: -drm_encoder_cleanup (encoder);return ret; }
Louis Chauvet
maintainerPATCH v8 3/8 drm/managed: Add DRM-managed alloc_ordered_workqueue
In reply to Louis ChauvetAdd drmm_alloc_ordered_workqueue(), a helper that provides managed ordered workqueue cleanup. The workqueue will be destroyed with the final reference of the DRM device.
---
Hi Thomas,
I noted that you wanted to mark this as Reviewed, but as this was not the complete patch, I prefered to have a confirmation before merging the patch.
Thanks for your time,
Louis Chauvet
--- drivers/gpu/drm/drm_managed.c | 8 ++++++++ include/drm/drm_managed.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)
drivers/gpu/drm/drm_managed.c +8 -0
@@ -310,3 +310,11 @@ void __drmm_mutex_release(struct drm_device *dev, void *res)mutex_destroy (lock); }EXPORT_SYMBOL (__drmm_mutex_release); + +void __drmm_destroy_workqueue (struct drm_device *device,void *res) +{ +struct workqueue_struct *wq = res; + +destroy_workqueue (wq); +} +EXPORT_SYMBOL (__drmm_destroy_workqueue);
include/drm/drm_managed.h +12 -0
@@ -127,4 +127,16 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);drmm_add_action_or_reset (dev, __drmm_mutex_release, lock); \ }) \ +void __drmm_destroy_workqueue (struct drm_device *device,void *wq); + +#define drmm_alloc_ordered_workqueue(dev, fmt, flags, args...) \ + ({ \ + struct workqueue_struct *wq = alloc_ordered_workqueue(fmt, flags, ##args); \ + wq ? ({ \ + int ret = drmm_add_action_or_reset(dev, __drmm_destroy_workqueue, wq); \ + ret ? ERR_PTR(ret) : wq; \ + }) : \ + wq; \ + }) +#endif
Signature · 1 line
2.47.1
Re: [PATCH v8 3/8] drm/managed: Add DRM-managed alloc_ordered_workqueue
Hi
Am 14.01.25 um 15:05 schrieb Louis Chauvet:
Quoted 42 lines
Add
drmm_alloc_ordered_workqueue(), a helper that provides managed ordered workqueue cleanup. The workqueue will be destroyed with the final reference of the DRM device.Signed-off-by Louis Chauvet <[email protected]>---
Hi Thomas,
I noted that you wanted to mark this as Reviewed, but as this was not the complete patch, I prefered to have a confirmation before merging the patch.
Thanks for your time,
Louis Chauvet--- drivers/gpu/drm/drm_managed.c | 8 ++++++++ include/drm/drm_managed.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/drm_managed.c +8
-0@@ -310,3 +310,11 @@ void __drmm_mutex_release(struct drm_device *dev, void *res)mutex_destroy (lock); }EXPORT_SYMBOL (__drmm_mutex_release); + +void __drmm_destroy_workqueue (struct drm_device *device,void *res) +{ +struct workqueue_struct *wq = res; + +destroy_workqueue (wq); +} +EXPORT_SYMBOL (__drmm_destroy_workqueue);include/drm/drm_managed.h +0
-0
include/drm/drm_managed.h void __drmm_mutex_release(struct drm_device *dev, void *res); · line 130
Quoted 4 lines
include/drm/drm_managed.h +1
-0@@ -127,4 +127,16 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);drmm_add_action_or_reset (dev, __drmm_mutex_release, lock); \ }) \ +void __drmm_destroy_workqueue (struct drm_device *device,void *wq);
A comment on the naming. This is the release helper for the workqueue. Rather call it __drm_workqueue_release(). The current name sounds like it is a drmm wrapper around destroy_workqueue(), which it isn't.
Apart from that,
Best regards
Thomas
Quoted 13 lines
include/drm/drm_managed.h +11
-0+ +#define drmm_alloc_ordered_workqueue(dev, fmt, flags, args...) \ + ({ \ + struct workqueue_struct *wq = alloc_ordered_workqueue(fmt, flags, ##args); \ + wq ? ({ \ + int ret = drmm_add_action_or_reset(dev, __drmm_destroy_workqueue, wq); \ + ret ? ERR_PTR(ret) : wq; \ + }) : \ + wq; \ + }) +#endif
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Maxime Ripard
maintainerRe: [PATCH v8 3/8] drm/managed: Add DRM-managed alloc_ordered_workqueue
In reply to Louis ChauvetQuoted 48 lines · Louis Chauvet
Add
drmm_alloc_ordered_workqueue(), a helper that provides managed ordered workqueue cleanup. The workqueue will be destroyed with the final reference of the DRM device.Signed-off-by Louis Chauvet <[email protected]>---
Hi Thomas,
I noted that you wanted to mark this as Reviewed, but as this was not the complete patch, I prefered to have a confirmation before merging the patch.
Thanks for your time,
Louis Chauvet--- drivers/gpu/drm/drm_managed.c | 8 ++++++++ include/drm/drm_managed.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/drm_managed.c +8
-0@@ -310,3 +310,11 @@ void __drmm_mutex_release(struct drm_device *dev, void *res)mutex_destroy (lock); }EXPORT_SYMBOL (__drmm_mutex_release); + +void __drmm_destroy_workqueue (struct drm_device *device,void *res) +{ +struct workqueue_struct *wq = res; + +destroy_workqueue (wq); +} +EXPORT_SYMBOL (__drmm_destroy_workqueue);include/drm/drm_managed.h +3
-0@@ -127,4 +127,16 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);drmm_add_action_or_reset (dev, __drmm_mutex_release, lock); \ }) \ +void __drmm_destroy_workqueue (struct drm_device *device,void *wq); + +#define drmm_alloc_ordered_workqueue(dev, fmt, flags, args...) \
include/drm/drm_managed.h void __drmm_mutex_release(struct drm_device *dev, void *res); · line 142
Quoted 10 lines
include/drm/drm_managed.h +9
-0+ ({ \ + struct workqueue_struct *wq = alloc_ordered_workqueue(fmt, flags, ##args); \ + wq ? ({ \ +int ret =drmm_add_action_or_reset (dev, __drmm_destroy_workqueue, wq); \ + ret ?ERR_PTR (ret) : wq; \ + }) : \ + wq; \ + }) +#endif
Is there a reason to do a macro and not a proper function?
Maxime
Louis Chauvet
maintainerRe: [PATCH v8 3/8] drm/managed: Add DRM-managed alloc_ordered_workqueue
Quoted 46 lines · Maxime Ripard
Quoted 45 lines · Louis Chauvet
Add
drmm_alloc_ordered_workqueue(), a helper that provides managed ordered workqueue cleanup. The workqueue will be destroyed with the final reference of the DRM device.Signed-off-by Louis Chauvet <[email protected]>---
Hi Thomas,
I noted that you wanted to mark this as Reviewed, but as this was not the complete patch, I prefered to have a confirmation before merging the patch.
Thanks for your time,
Louis Chauvet--- drivers/gpu/drm/drm_managed.c | 8 ++++++++ include/drm/drm_managed.h | 12 ++++++++++++ 2 files changed, 20 insertions(+)drivers/gpu/drm/drm_managed.c +8
-0@@ -310,3 +310,11 @@ void __drmm_mutex_release(struct drm_device *dev, void *res)mutex_destroy (lock); }EXPORT_SYMBOL (__drmm_mutex_release); + +void __drmm_destroy_workqueue (struct drm_device *device,void *res) +{ +struct workqueue_struct *wq = res; + +destroy_workqueue (wq); +} +EXPORT_SYMBOL (__drmm_destroy_workqueue);include/drm/drm_managed.h +0
-0@@ -127,4 +127,16 @@ void __drmm_mutex_release(struct drm_device *dev, void *res);drmm_add_action_or_reset (dev, __drmm_mutex_release, lock); \ }) \
Quoted 15 lines
include/drm/drm_managed.h void __drmm_mutex_release(struct drm_device *dev, void *res); · line 142
Quoted 13 lines
include/drm/drm_managed.h +12
-0+void __drmm_destroy_workqueue (struct drm_device *device,void *wq); + +#define drmm_alloc_ordered_workqueue(dev, fmt, flags, args...) \ + ({ \ + struct workqueue_struct *wq = alloc_ordered_workqueue(fmt, flags, ##args); \ + wq ? ({ \ + int ret = drmm_add_action_or_reset(dev, __drmm_destroy_workqueue, wq); \ + ret ? ERR_PTR(ret) : wq; \ + }) : \ + wq; \ + }) +#endif Is there a reason to do a macro and not a proper function?
I wrote a macro because creating a proper function is more complex. The function would require a va_list variant for alloc_ordered_workqueue, which does not currently exist.
Louis Chauvet
---
Sorry if you received this message twice. The first attempt was rejected by most of the recipients, including mailing lists.
Quoted 1 line
Maxime
Louis Chauvet
maintainerPATCH v8 4/8 drm/vkms: Switch to managed for crtc
In reply to Louis ChauvetThe current VKMS driver uses managed function to create crtc, but don't use it to properly clean the crtc workqueue. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers.
--- drivers/gpu/drm/vkms/vkms_crtc.c | 5 ++++- drivers/gpu/drm/vkms/vkms_drv.c | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/gpu/drm/vkms/vkms_crtc.c +4 -1
@@ -4,6 +4,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h>
@@ -296,7 +297,9 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,spin_lock_init (&vkms_out->lock);spin_lock_init (&vkms_out->composer_lock); - vkms_out->composer_workq =alloc_ordered_workqueue ("vkms_composer" ,0 ); + vkms_out->composer_workq =drmm_alloc_ordered_workqueue (dev,"vkms_composer" ,0 ); +if (IS_ERR (vkms_out->composer_workq)) +return PTR_ERR (vkms_out->composer_workq);if (!vkms_out->composer_workq)return -ENOMEM ;
drivers/gpu/drm/vkms/vkms_drv.c +0 -9
@@ -53,14 +53,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;
@@ -108,7 +100,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 ,DRM_FBDEV_SHMEM_DRIVER_OPS ,
Signature · 1 line
2.47.1
Re: [PATCH v8 4/8] drm/vkms: Switch to managed for crtc
Quoted 7 lines · Louis Chauvet
The current VKMS driver uses managed function to create crtc, but don't use it to properly clean the crtc workqueue. It is not an issue yet, but in order to support multiple devices easily, convert this code to use drm and device managed helpers.
[ ... ]
Thanks!
Maxime
PATCH v8 4/8 drm/vkms: Switch to managed for crtc
In reply to Louis ChauvetQuoted 7 lines
The current VKMS driver uses managed function to create crtc, but don't use it to properly clean the crtc workqueue. 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 <[email protected]>Acked-by Maxime Ripard <[email protected]>
Thanks!
Quoted 56 lines
--- drivers/gpu/drm/vkms/vkms_crtc.c | 5 ++++- drivers/gpu/drm/vkms/vkms_drv.c | 9 --------- 2 files changed, 4 insertions(+), 10 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +4
-1@@ -4,6 +4,7 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_managed.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> @@ -296,7 +297,9 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,spin_lock_init (&vkms_out->lock);spin_lock_init (&vkms_out->composer_lock); - vkms_out->composer_workq =alloc_ordered_workqueue ("vkms_composer" ,0 ); + vkms_out->composer_workq =drmm_alloc_ordered_workqueue (dev,"vkms_composer" ,0 ); +if (IS_ERR (vkms_out->composer_workq)) +return PTR_ERR (vkms_out->composer_workq);if (!vkms_out->composer_workq)return -ENOMEM ;drivers/gpu/drm/vkms/vkms_drv.c +0
-9@@ -53,14 +53,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;@@ -108,7 +100,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 ,DRM_FBDEV_SHMEM_DRIVER_OPS ,
Louis Chauvet
maintainerPATCH v8 5/8 drm: writeback: Create an helper for drm_writeback_connector initialization
In reply to Louis ChauvetAs the old drm and the new drmm variants of drm_writeback_connector requires almost the same initialization, create an internal helper to do most of the initialization work.
Currently there is no cleanup function for writeback connectors. To allows implementation of drmm variant of writeback connector, create a cleanup function that can be used to properly remove all the writeback-specific properties and allocations.
This also introduce an helper to cleanup only the drm_writeback_connector properties, so it can be used during initialization to cleanup in case of failure.
--- drivers/gpu/drm/drm_writeback.c | 130 ++++++++++++++++++++++++++++++++-------- 1 file changed, 104 insertions(+), 26 deletions(-)
drivers/gpu/drm/drm_writeback.c +104 -26
@@ -15,6 +15,7 @@#include <drm/drm_device.h> #include <drm/drm_drv.h> #include <drm/drm_framebuffer.h> +#include <drm/drm_managed.h> #include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_property.h> #include <drm/drm_writeback.h>
@@ -140,6 +141,22 @@ static int create_writeback_properties(struct drm_device *dev)return 0 ; } +static void delete_writeback_properties (struct drm_device *dev) +{ +if (dev->mode_config.writeback_pixel_formats_property) { +drm_property_destroy (dev, dev->mode_config.writeback_pixel_formats_property); + dev->mode_config.writeback_pixel_formats_property =NULL ; + } +if (dev->mode_config.writeback_out_fence_ptr_property) { +drm_property_destroy (dev, dev->mode_config.writeback_out_fence_ptr_property); + dev->mode_config.writeback_out_fence_ptr_property =NULL ; + } +if (dev->mode_config.writeback_fb_id_property) { +drm_property_destroy (dev, dev->mode_config.writeback_fb_id_property); + dev->mode_config.writeback_fb_id_property =NULL ; + } +} +static const struct drm_encoder_funcs drm_writeback_encoder_funcs = { .destroy = drm_encoder_cleanup, };
@@ -202,7 +219,6 @@ EXPORT_SYMBOL(drm_writeback_connector_init);* @dev: DRM device * @wb_connector: Writeback connector to initialize * @enc: handle to the already initialized drm encoder -* @con_funcs: Connector funcs vtable * @formats: Array of supported pixel formats for the writeback engine * @n_formats: Length of the formats array *
@@ -218,41 +234,31 @@ EXPORT_SYMBOL(drm_writeback_connector_init);* assigning the encoder helper functions, possible_crtcs and any other encoder * specific operation. * -* Drivers should always use this function instead of drm_connector_init() to -* set up writeback connectors if they want to manage themselves the lifetime of the -* associated encoder. -* * Returns: 0 on success, or a negative error code */ -int drm_writeback_connector_init_with_encoder (struct drm_device *dev, -struct drm_writeback_connector *wb_connector,struct drm_encoder *enc, -const struct drm_connector_funcs *con_funcs,const u32 *formats, -int n_formats) +static int __drm_writeback_connector_init (struct drm_device *dev, +struct drm_writeback_connector *wb_connector, +struct drm_encoder *enc,const u32 *formats, +int n_formats) { -struct drm_property_blob *blob;struct drm_connector *connector = &wb_connector->base;struct drm_mode_config *config = &dev->mode_config; +struct drm_property_blob *blob;int ret =create_writeback_properties (dev);if (ret !=0 )return ret; - blob =drm_property_create_blob (dev, n_formats *sizeof (*formats), - formats); -if (IS_ERR (blob)) -return PTR_ERR (blob); - - connector->interlace_allowed =0 ; - ret =drm_connector_init (dev, connector, con_funcs, -DRM_MODE_CONNECTOR_WRITEBACK ); -if (ret) - goto connector_fail; - ret =drm_connector_attach_encoder (connector, enc);if (ret) - goto attach_fail; +return ret; + + blob =drm_property_create_blob (dev, n_formats *sizeof (*formats), + formats); +if (IS_ERR (blob)) +return PTR_ERR (blob);INIT_LIST_HEAD (&wb_connector->job_queue);spin_lock_init (&wb_connector->job_lock);
@@ -275,15 +281,87 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev, wb_connector->pixel_formats_blob_ptr = blob;return 0 ; +} + +/** +* drm_writeback_connector_init_with_encoder - Initialize a writeback connector with +* a custom encoder +* +* @dev: DRM device +* @wb_connector: Writeback connector to initialize +* @enc: handle to the already initialized drm encoder +* @con_funcs: Connector funcs vtable +* @formats: Array of supported pixel formats for the writeback engine +* @n_formats: Length of the formats array +* +* This function creates the writeback-connector-specific properties if they +* have not been already created, initializes the connector as +* type DRM_MODE_CONNECTOR_WRITEBACK, and correctly initializes the property +* values. +* +* This function assumes that the drm_writeback_connector's encoder has already been +* created and initialized before invoking this function. +* +* In addition, this function also assumes that callers of this API will manage +* assigning the encoder helper functions, possible_crtcs and any other encoder +* specific operation. +* +* Drivers should always use this function instead of drm_connector_init() to +* set up writeback connectors if they want to manage themselves the lifetime of the +* associated encoder. +* +* Returns: 0 on success, or a negative error code +*/ +int drm_writeback_connector_init_with_encoder (struct drm_device *dev, +struct drm_writeback_connector *wb_connector, +struct drm_encoder *enc, +const struct drm_connector_funcs *con_funcs, +const u32 *formats,int n_formats) +{ +struct drm_property_blob *blob; +struct drm_connector *connector = &wb_connector->base; +int ret; + + ret =drm_connector_init (dev, connector, con_funcs, +DRM_MODE_CONNECTOR_WRITEBACK ); +if (ret) +return ret; + + ret =__drm_writeback_connector_init (dev, wb_connector, enc, formats, + n_formats); +if (ret) +drm_connector_cleanup (connector); -attach_fail: -drm_connector_cleanup (connector); -connector_fail: -drm_property_blob_put (blob);return ret; }EXPORT_SYMBOL (drm_writeback_connector_init_with_encoder); +/** +* drm_writeback_connector_cleanup - Cleanup the writeback connector +* @dev: DRM device +* @wb_connector: Pointer to the writeback connector to clean up +* +* This will decrement the reference counter of blobs and destroy properties. It +* will also clean the remaining jobs in this writeback connector. Caution: This helper will not +* clean up the attached encoder and the drm_connector. +*/ +static void drm_writeback_connector_cleanup (struct drm_device *dev, +struct drm_writeback_connector *wb_connector) +{ +unsigned long flags; +struct drm_writeback_job *pos, *n; + +delete_writeback_properties (dev); +drm_property_blob_put (wb_connector->pixel_formats_blob_ptr); + +spin_lock_irqsave (&wb_connector->job_lock, flags); +list_for_each_entry_safe (pos, n, &wb_connector->job_queue, list_entry) { +drm_writeback_cleanup_job (pos); +list_del (&pos->list_entry); + } +spin_unlock_irqrestore (&wb_connector->job_lock, flags); +} +int drm_writeback_set_fb (struct drm_connector_state *conn_state,struct drm_framebuffer *fb) {
Signature · 1 line
2.47.1
Louis Chauvet
maintainerPATCH v8 6/8 drm: writeback: Add missing cleanup in case of initialization failure
In reply to Louis ChauvetThe current implementation of drm_writeback_connector initialization does not properly clean up all resources in case of failure (allocated properties and possible_encoders). Add this cleaning in case of failure.
--- drivers/gpu/drm/drm_writeback.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_writeback.c +9 -4
@@ -247,18 +247,20 @@ static int __drm_writeback_connector_init(struct drm_device *dev,int ret =create_writeback_properties (dev);if (ret !=0 ) -return ret; + goto failed_properties; connector->interlace_allowed =0 ; ret =drm_connector_attach_encoder (connector, enc);if (ret) -return ret; + goto failed_properties; blob =drm_property_create_blob (dev, n_formats *sizeof (*formats), formats); -if (IS_ERR (blob)) -return PTR_ERR (blob); +if (IS_ERR (blob)) { + ret =PTR_ERR (blob); + goto failed_properties; + }INIT_LIST_HEAD (&wb_connector->job_queue);spin_lock_init (&wb_connector->job_lock);
@@ -281,6 +283,9 @@ static int __drm_writeback_connector_init(struct drm_device *dev, wb_connector->pixel_formats_blob_ptr = blob;return 0 ; +failed_properties: +delete_writeback_properties (dev); +return ret; }/**
Signature · 1 line
2.47.1
Louis Chauvet
maintainerPATCH v8 7/8 drm: writeback: Create drmm variants for drm_writeback_connector initialization
In reply to Louis ChauvetTo allows driver to only use drmm objects, add helper to create drm_writeback_connectors with automated lifetime management.
--- drivers/gpu/drm/drm_writeback.c | 48 +++++++++++++++++++++++++++++++++++++++++ include/drm/drm_writeback.h | 6 ++++++ 2 files changed, 54 insertions(+)
drivers/gpu/drm/drm_writeback.c +48 -0
@@ -367,6 +367,54 @@ static void drm_writeback_connector_cleanup(struct drm_device *dev,spin_unlock_irqrestore (&wb_connector->job_lock, flags); } +/** +* drmm_writeback_connector_init - Initialize a writeback connector with +* a custom encoder +* +* @dev: DRM device +* @wb_connector: Writeback connector to initialize +* @con_funcs: Connector funcs vtable +* @enc: Encoder to connect this writeback connector +* @formats: Array of supported pixel formats for the writeback engine +* @n_formats: Length of the formats array +* +* This function initialize a writeback connector and register its cleanup. +* +* This function creates the writeback-connector-specific properties if they +* have not been already created, initializes the connector as +* type DRM_MODE_CONNECTOR_WRITEBACK, and correctly initializes the property +* values. +* +* Returns: 0 on success, or a negative error code +*/ +int drmm_writeback_connector_init (struct drm_device *dev, +struct drm_writeback_connector *wb_connector, +const struct drm_connector_funcs *con_funcs, +struct drm_encoder *enc, +const u32 *formats,int n_formats) +{ +struct drm_connector *connector = &wb_connector->base; +int ret; + + ret =drmm_connector_init (dev, connector, con_funcs, +DRM_MODE_CONNECTOR_WRITEBACK ,NULL ); +if (ret) +return ret; + + ret =__drm_writeback_connector_init (dev, wb_connector, enc, formats, + n_formats); +if (ret) +return ret; + + ret =drmm_add_action_or_reset (dev, (void *)drm_writeback_connector_cleanup, + wb_connector); +if (ret) +return ret; + +return 0 ; +} +EXPORT_SYMBOL (drmm_writeback_connector_init); +int drm_writeback_set_fb (struct drm_connector_state *conn_state,struct drm_framebuffer *fb) {
include/drm/drm_writeback.h +6 -0
@@ -161,6 +161,12 @@ int drm_writeback_connector_init_with_encoder(struct drm_device *dev, const struct drm_connector_funcs *con_funcs, const u32 *formats, int n_formats); +int drmm_writeback_connector_init (struct drm_device *dev, +struct drm_writeback_connector *wb_connector, +const struct drm_connector_funcs *con_funcs, +struct drm_encoder *enc, +const u32 *formats,int n_formats); +int drm_writeback_set_fb (struct drm_connector_state *conn_state,struct drm_framebuffer *fb);
Signature · 1 line
2.47.1
Re: [PATCH v8 7/8] drm: writeback: Create drmm variants for drm_writeback_connector initialization
Quoted 7 lines · Louis Chauvet
To allows driver to only use drmm objects, add helper to create
drm_writeback_connectorswith automated lifetime management.Signed-off-by Louis Chauvet <[email protected]>[ ... ]
Thanks!
Maxime
Louis Chauvet
maintainerPATCH v8 8/8 drm/vkms: Switch to managed for writeback connector
In reply to Louis ChauvetThe current VKMS driver uses non-managed function to create writeback 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.
--- drivers/gpu/drm/vkms/vkms_drv.h | 3 ++- drivers/gpu/drm/vkms/vkms_output.c | 2 +- drivers/gpu/drm/vkms/vkms_writeback.c | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +2 -1
@@ -179,6 +179,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct drm_writeback_connector wb_connector; +struct drm_encoder wb_encoder;struct hrtimer vblank_hrtimer;ktime_t period_ns;struct workqueue_struct *composer_workq;
@@ -275,6 +276,6 @@ void vkms_set_composer(struct vkms_output *out, bool enabled);void vkms_writeback_row (struct vkms_writeback_job *wb,const struct line_buffer *src_buffer,int y);/* Writeback */ -int vkms_enable_writeback_connector (struct vkms_device *vkmsdev); +int vkms_enable_writeback_connector (struct vkms_device *vkmsdev,struct drm_crtc *crtc);#endif /* _VKMS_DRV_H_ */
drivers/gpu/drm/vkms/vkms_output.c +1 -1
@@ -95,7 +95,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) }if (vkmsdev->config->writeback) { - writeback =vkms_enable_writeback_connector (vkmsdev); + writeback =vkms_enable_writeback_connector (vkmsdev, crtc);if (writeback)DRM_ERROR ("Failed to init writeback connector\n" ); }
drivers/gpu/drm/vkms/vkms_writeback.c +13 -8
@@ -24,7 +24,6 @@ static const u32 vkms_wb_formats[] = {static const struct drm_connector_funcs vkms_wb_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,
@@ -163,16 +162,22 @@ 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 drm_crtc *crtc) {struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; +int ret; + + ret =drmm_encoder_init (&vkmsdev->drm, &vkmsdev->output.wb_encoder, +NULL ,DRM_MODE_ENCODER_VIRTUAL ,NULL ); +if (ret) +return ret; + vkmsdev->output.wb_encoder.possible_crtcs |=drm_crtc_mask (crtc);drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs); -return drm_writeback_connector_init (&vkmsdev->drm, wb, - &vkms_wb_connector_funcs, -NULL , - vkms_wb_formats, -ARRAY_SIZE (vkms_wb_formats), -1 ); +return drmm_writeback_connector_init (&vkmsdev->drm, wb, + &vkms_wb_connector_funcs, + &vkmsdev->output.wb_encoder, + vkms_wb_formats, +ARRAY_SIZE (vkms_wb_formats)); }
Signature · 1 line
2.47.1
Re: [PATCH v8 8/8] drm/vkms: Switch to managed for writeback connector
Quoted 7 lines · Louis Chauvet
The current VKMS driver uses non-managed function to create writeback 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.
[ ... ]
Thanks!
Maxime
PATCH v8 8/8 drm/vkms: Switch to managed for writeback connector
In reply to Louis ChauvetQuoted 8 lines
The current VKMS driver uses non-managed function to create writeback 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 <[email protected]>Acked-by Maxime Ripard <[email protected]>
Thanks!
Quoted 82 lines
--- drivers/gpu/drm/vkms/vkms_drv.h | 3 ++- drivers/gpu/drm/vkms/vkms_output.c | 2 +- drivers/gpu/drm/vkms/vkms_writeback.c | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-)drivers/gpu/drm/vkms/vkms_drv.h +2
-1@@ -179,6 +179,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct drm_writeback_connector wb_connector; +struct drm_encoder wb_encoder;struct hrtimer vblank_hrtimer;ktime_t period_ns;struct workqueue_struct *composer_workq;@@ -275,6 +276,6 @@ void vkms_set_composer(struct vkms_output *out, bool enabled);void vkms_writeback_row (struct vkms_writeback_job *wb,const struct line_buffer *src_buffer,int y);/* Writeback */ -int vkms_enable_writeback_connector (struct vkms_device *vkmsdev); +int vkms_enable_writeback_connector (struct vkms_device *vkmsdev,struct drm_crtc *crtc);#endif /* _VKMS_DRV_H_ */ drivers/gpu/drm/vkms/vkms_output.c +1
-1@@ -95,7 +95,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) }if (vkmsdev->config->writeback) { - writeback =vkms_enable_writeback_connector (vkmsdev); + writeback =vkms_enable_writeback_connector (vkmsdev, crtc);if (writeback)DRM_ERROR ("Failed to init writeback connector\n" ); }drivers/gpu/drm/vkms/vkms_writeback.c +13
-8@@ -24,7 +24,6 @@ static const u32 vkms_wb_formats[] = {static const struct drm_connector_funcs vkms_wb_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,@@ -163,16 +162,22 @@ 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 drm_crtc *crtc) {struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; +int ret; + + ret =drmm_encoder_init (&vkmsdev->drm, &vkmsdev->output.wb_encoder, +NULL ,DRM_MODE_ENCODER_VIRTUAL ,NULL ); +if (ret) +return ret; + vkmsdev->output.wb_encoder.possible_crtcs |=drm_crtc_mask (crtc);drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs); -return drm_writeback_connector_init (&vkmsdev->drm, wb, - &vkms_wb_connector_funcs, -NULL , - vkms_wb_formats, -ARRAY_SIZE (vkms_wb_formats), -1 ); +return drmm_writeback_connector_init (&vkmsdev->drm, wb, + &vkms_wb_connector_funcs, + &vkmsdev->output.wb_encoder, + vkms_wb_formats, +ARRAY_SIZE (vkms_wb_formats)); }