Decouple config data for configfs
v5 cover Decouple config data for configfs
This patchset aims to lay down some prep work before configfs can be implemented for the vkms driver. The first patch in the series adds a new type vkms_config to track device configuration. The second and third patch add module testing support for writeback operations.
The first patch is developed by Daniel Vetter.
Daniel Vetter (1):
drm/vkms: Add vkms_config type
Sumera Priyadarsini (3):
drm/vkms: Add vkms_config type
drm/vkms: Add support for writeback module
drm/vkms: Add information about module options
Documentation/gpu/vkms.rst | 12 ++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 45 ++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_drv.h | 13 +++++++-- drivers/gpu/drm/vkms/vkms_output.c | 13 +++++---- 4 files changed, 68 insertions(+), 15 deletions(-)
---
Changes in v2:
- add Co-developed-by tag
Changes in v3:
- correct usage of Co-developed by tag(Melissa)
- add enable_writeback_feature(Melissa)
- modify commit message(Melissa)
Changes in v4:
- split previous patch into patchset(Melissa)
- fix checkpatch issue(Melissa)
- update docs(Daniel)
Changes in v5:
- modify docs patch(Daniel)
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 1/3 drm/vkms: Add vkms_config type
Currently, data for the device instance is held by vkms_device. Add a separate type, vkms_config to contain configuration details for the device and various modes to be later used by configfs. This config data stays constant once the device is created.
Accordingly, add vkms_create and vkms_destroy to initialize/destroy device through configfs. Currently, they are being called from vkms_init and vkms_exit, but will be evoked from configfs later on. When configfs is added, device configuration will be tracked by configfs and only vkms device lifetime will be handled by vkms_init and vkms_exit functions.
Modify usage of enable_cursor feature to reflect the changes in relevant files.
--- drivers/gpu/drm/vkms/vkms_drv.c | 40 ++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_drv.h | 12 +++++++-- drivers/gpu/drm/vkms/vkms_output.c | 4 +-- 3 files changed, 44 insertions(+), 12 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.c +32 -8
@@ -34,9 +34,9 @@#define DRIVER_MAJOR 1#define DRIVER_MINOR 0 -static struct vkms_device *vkms_device; +static struct vkms_config *default_config; -bool enable_cursor = true; +static bool enable_cursor = true;module_param_named (enable_cursor, enable_cursor, bool,0444 );MODULE_PARM_DESC (enable_cursor,"Enable/Disable cursor support" );
@@ -122,10 +122,11 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev)return vkms_output_init (vkmsdev,0 ); } -static int __init vkms_init (void ) +static int vkms_create (struct vkms_config *config) {int ret;struct platform_device *pdev; +struct vkms_device *vkms_device; pdev =platform_device_register_simple (DRIVER_NAME ,-1 ,NULL ,0 );if (IS_ERR (pdev))
@@ -143,6 +144,8 @@ static int __init vkms_init(void) goto out_devres; } vkms_device->platform = pdev; + vkms_device->config = config; + config->dev = vkms_device; ret =dma_coerce_mask_and_coherent (vkms_device->drm.dev,DMA_BIT_MASK (64 ));
@@ -179,21 +182,42 @@ static int __init vkms_init(void)return ret; } -static void __exit vkms_exit(void) +static int __init vkms_init (void ) +{ +struct vkms_config *config =kmalloc (sizeof (*config),GFP_KERNEL ); + + default_config = config; + + config->cursor = enable_cursor; + +return vkms_create (config); +} + +static void vkms_destroy (struct vkms_config *config) {struct platform_device *pdev; -if (!vkms_device) { +if (!config->dev) {DRM_INFO ("vkms_device is NULL.\n" );return ; } - pdev = vkms_device->platform; + pdev = config->dev->platform; -drm_dev_unregister (&vkms_device->drm); -drm_atomic_helper_shutdown (&vkms_device->drm); +drm_dev_unregister (&config->dev->drm); +drm_atomic_helper_shutdown (&config->dev->drm);devres_release_group (&pdev->dev,NULL );platform_device_unregister (pdev); + + config->dev =NULL ; +} + +static void __exit vkms_exit(void) +{ +if (default_config->dev) +vkms_destroy (default_config); + +kfree (default_config); }module_init (vkms_init);
drivers/gpu/drm/vkms/vkms_drv.h +10 -2
@@ -19,8 +19,6 @@#define XRES_MAX 8192#define YRES_MAX 8192 -extern bool enable_cursor; -struct vkms_composer {struct drm_framebuffer fb;struct drm_rect src, dst;
@@ -82,10 +80,19 @@ struct vkms_output {spinlock_t composer_lock; }; +struct vkms_device ; + +struct vkms_config { +bool cursor; +/* only set when instantiated */ +struct vkms_device *dev; +}; +struct vkms_device {struct drm_device drm;struct platform_device *platform;struct vkms_output output; +const struct vkms_config *config; };#define drm_crtc_to_vkms_output (target) \
@@ -124,3 +131,4 @@ void vkms_set_composer(struct vkms_output *out, bool enabled);int vkms_enable_writeback_connector (struct vkms_device *vkmsdev);#endif /* _VKMS_DRV_H_ */ +
drivers/gpu/drm/vkms/vkms_output.c +2 -2
@@ -46,7 +46,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)if (IS_ERR (primary))return PTR_ERR (primary); -if (enable_cursor) { +if (vkmsdev->config->cursor) { cursor =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_CURSOR , index);if (IS_ERR (cursor)) { ret =PTR_ERR (cursor);
@@ -98,7 +98,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)drm_crtc_cleanup (crtc); err_crtc: -if (enable_cursor) +if (vkmsdev->config->cursor)drm_plane_cleanup (cursor); err_cursor:
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V5 1/3] drm/vkms: Add vkms_config type
Quoted 143 lines · Sumera Priyadarsini
Currently, data for the device instance is held by
vkms_device. Add a separate type,vkms_configto contain configuration details for the device and various modes to be later used by configfs. This config data stays constant once the device is created.Accordingly, add
vkms_createandvkms_destroyto initialize/destroy device through configfs. Currently, they are being called fromvkms_initandvkms_exit, but will be evoked from configfs later on. When configfs is added, device configuration will be tracked by configfs and only vkms device lifetime will be handled byvkms_initandvkms_exitfunctions.Modify usage of
enable_cursorfeature to reflect the changes in relevant files.Co-developed-by Daniel Vetter <[email protected]>Signed-off-by Daniel Vetter <[email protected]>Signed-off-by Sumera Priyadarsini <[email protected]>--- drivers/gpu/drm/vkms/vkms_drv.c | 40 ++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_drv.h | 12 +++++++-- drivers/gpu/drm/vkms/vkms_output.c | 4 +-- 3 files changed, 44 insertions(+), 12 deletions(-)drivers/gpu/drm/vkms/vkms_drv.c +32
-8@@ -34,9 +34,9 @@#define DRIVER_MAJOR 1#define DRIVER_MINOR 0 -static struct vkms_device *vkms_device; +static struct vkms_config *default_config; -bool enable_cursor = true; +static bool enable_cursor = true;module_param_named (enable_cursor, enable_cursor, bool,0444 );MODULE_PARM_DESC (enable_cursor,"Enable/Disable cursor support" );@@ -122,10 +122,11 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev)return vkms_output_init (vkmsdev,0 ); } -static int __init vkms_init (void ) +static int vkms_create (struct vkms_config *config) {int ret;struct platform_device *pdev; +struct vkms_device *vkms_device; pdev =platform_device_register_simple (DRIVER_NAME ,-1 ,NULL ,0 );if (IS_ERR (pdev))@@ -143,6 +144,8 @@ static int __init vkms_init(void) goto out_devres; } vkms_device->platform = pdev; + vkms_device->config = config; + config->dev = vkms_device; ret =dma_coerce_mask_and_coherent (vkms_device->drm.dev,DMA_BIT_MASK (64 ));@@ -179,21 +182,42 @@ static int __init vkms_init(void)return ret; } -static void __exit vkms_exit(void) +static int __init vkms_init (void ) +{ +struct vkms_config *config =kmalloc (sizeof (*config),GFP_KERNEL ); + + default_config = config; + + config->cursor = enable_cursor; + +return vkms_create (config); +} + +static void vkms_destroy (struct vkms_config *config) {struct platform_device *pdev; -if (!vkms_device) { +if (!config->dev) {DRM_INFO ("vkms_device is NULL.\n" );return ; } - pdev = vkms_device->platform; + pdev = config->dev->platform; -drm_dev_unregister (&vkms_device->drm); -drm_atomic_helper_shutdown (&vkms_device->drm); +drm_dev_unregister (&config->dev->drm); +drm_atomic_helper_shutdown (&config->dev->drm);devres_release_group (&pdev->dev,NULL );platform_device_unregister (pdev); + + config->dev =NULL ; +} + +static void __exit vkms_exit(void) +{ +if (default_config->dev) +vkms_destroy (default_config); + +kfree (default_config); }module_init (vkms_init);drivers/gpu/drm/vkms/vkms_drv.h +9
-2@@ -19,8 +19,6 @@#define XRES_MAX 8192#define YRES_MAX 8192 -extern bool enable_cursor; -struct vkms_composer {struct drm_framebuffer fb;struct drm_rect src, dst;@@ -82,10 +80,19 @@ struct vkms_output {spinlock_t composer_lock; }; +struct vkms_device ; + +struct vkms_config { +bool cursor; +/* only set when instantiated */ +struct vkms_device *dev; +}; +struct vkms_device {struct drm_device drm;struct platform_device *platform;struct vkms_output output; +const struct vkms_config *config; };#define drm_crtc_to_vkms_output (target) \
drivers/gpu/drm/vkms/vkms_drv.h void vkms_set_composer(struct vkms_output *out, bool enabled); · line 134
Quoted 4 lines
drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -124,3 +131,4 @@ void vkms_set_composer(struct vkms_output *out, bool enabled);int vkms_enable_writeback_connector (struct vkms_device *vkmsdev);#endif /* _VKMS_DRV_H_ */ +
There is an extra line here
Apart from that, looks good to me.
Quoted 25 lines
drivers/gpu/drm/vkms/vkms_output.c +2
-2@@ -46,7 +46,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)if (IS_ERR (primary))return PTR_ERR (primary); -if (enable_cursor) { +if (vkmsdev->config->cursor) { cursor =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_CURSOR , index);if (IS_ERR (cursor)) { ret =PTR_ERR (cursor);@@ -98,7 +98,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)drm_crtc_cleanup (crtc); err_crtc: -if (enable_cursor) +if (vkmsdev->config->cursor)drm_plane_cleanup (cursor); err_cursor:Signature · 1 line
2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 2/3 drm/vkms: Add support for writeback module
In reply to Sumera PriyadarsiniAdd enable_writeback feature to vkms_config as a module.
--- drivers/gpu/drm/vkms/vkms_drv.c | 5 +++++ drivers/gpu/drm/vkms/vkms_drv.h | 1 + drivers/gpu/drm/vkms/vkms_output.c | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.c +5 -0
@@ -40,6 +40,10 @@ static bool enable_cursor = true;module_param_named (enable_cursor, enable_cursor, bool,0444 );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" ); +DEFINE_DRM_GEM_FOPS (vkms_driver_fops);static void vkms_release (struct drm_device *dev)
@@ -189,6 +193,7 @@ static int __init vkms_init(void) default_config = config; config->cursor = enable_cursor; + config->writeback = enable_writeback;return vkms_create (config); }
drivers/gpu/drm/vkms/vkms_drv.h +1 -0
@@ -83,6 +83,7 @@ struct vkms_output {struct vkms_device ;struct vkms_config { +bool writeback;bool cursor;/* only set when instantiated */ struct vkms_device *dev;
drivers/gpu/drm/vkms/vkms_output.c +6 -3
@@ -41,6 +41,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)struct drm_crtc *crtc = &output->crtc;struct drm_plane *primary, *cursor =NULL ;int ret; +int writeback; primary =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_PRIMARY , index);if (IS_ERR (primary))
@@ -80,9 +81,11 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) goto err_attach; } - ret =vkms_enable_writeback_connector (vkmsdev); -if (ret) -DRM_ERROR ("Failed to init writeback connector\n" ); +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);
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V5 2/3] drm/vkms: Add support for writeback module
Quoted 58 lines · Sumera Priyadarsini
Add
enable_writebackfeature tovkms_configas a module.Signed-off-by Sumera Priyadarsini <[email protected]>--- drivers/gpu/drm/vkms/vkms_drv.c | 5 +++++ drivers/gpu/drm/vkms/vkms_drv.h | 1 + drivers/gpu/drm/vkms/vkms_output.c | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-)drivers/gpu/drm/vkms/vkms_drv.c +5
-0@@ -40,6 +40,10 @@ static bool enable_cursor = true;module_param_named (enable_cursor, enable_cursor, bool,0444 );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" ); +DEFINE_DRM_GEM_FOPS (vkms_driver_fops);static void vkms_release (struct drm_device *dev)@@ -189,6 +193,7 @@ static int __init vkms_init(void) default_config = config; config->cursor = enable_cursor; + config->writeback = enable_writeback;return vkms_create (config); }drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -83,6 +83,7 @@ struct vkms_output {struct vkms_device ;struct vkms_config { +bool writeback;bool cursor;/* only set when instantiated */ struct vkms_device *dev;drivers/gpu/drm/vkms/vkms_output.c +1
-0@@ -41,6 +41,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)struct drm_crtc *crtc = &output->crtc;struct drm_plane *primary, *cursor =NULL ;int ret; +int writeback; primary =vkms_plane_init (vkmsdev,DRM_PLANE_TYPE_PRIMARY , index);if (IS_ERR (primary))@@ -80,9 +81,11 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) goto err_attach;
drivers/gpu/drm/vkms/vkms_output.c int vkms_output_init(struct vkms_device *vkmsdev, int index) · line 88
Quoted 10 lines
drivers/gpu/drm/vkms/vkms_output.c +5
-3} - ret =vkms_enable_writeback_connector (vkmsdev); -if (ret) -DRM_ERROR ("Failed to init writeback connector\n" ); +if (vkmsdev->config->writeback) { + writeback =vkms_enable_writeback_connector (vkmsdev); +if (writeback) +DRM_ERROR ("Failed to init writeback connector\n" ); + }
Thanks,
Quoted 6 lines
drivers/gpu/drm/vkms/vkms_output.c +0
-0drm_mode_config_reset (dev);Signature · 1 line
2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 3/3 drm/vkms: Add information about module options
In reply to Sumera PriyadarsiniUpdate vkms documentation to contain usage of modinfo command and steps to load vkms with module options enabled.
--- Documentation/gpu/vkms.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/gpu/vkms.rst +12 -0
@@ -35,6 +35,18 @@ Now, to load the driver, use:: On running the lsmod command now, the VKMS driver will appear listed. You can also observe the driver being loaded in the dmesg logs. +The VKMS driver has optional features to simulate different kinds of hardware, +which are exposed as module options. You can use the `modinfo` command +to see the module options for vkms:: + + modinfo vkms + +Module options are helpful when testing, and enabling modules +can be done while loading vkms. For example, to load vkms with cursor enabled, +use:: + + sudo modprobe vkms enable_cursor=1 + To disable the driver, use :: sudo modprobe -r vkms
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH V5 3/3] drm/vkms: Add information about module options
Quoted 18 lines · Sumera Priyadarsini
Update vkms documentation to contain usage of
modinfocommand and steps to load vkms with module options enabled.Signed-off-by Sumera Priyadarsini <[email protected]>--- Documentation/gpu/vkms.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+)Documentation/gpu/vkms.rst +2
-0@@ -35,6 +35,18 @@ Now, to load the driver, use:: On running the lsmod command now, the VKMS driver will appear listed. You can also observe the driver being loaded in the dmesg logs. +The VKMS driver has optional features to simulate different kinds of hardware, +which are exposed as module options. You can use the `modinfo` command
Documentation/gpu/vkms.rst Now, to load the driver, use:: · line 49
Quoted 10 lines
Documentation/gpu/vkms.rst +10
-0+to see the module options for vkms:: + + modinfo vkms + +Module options are helpful when testing, and enabling modules +can be done while loading vkms. For example, to load vkms with cursor enabled, +use:: + + sudo modprobe vkms enable_cursor=1 +
Hi Sumera,
Thanks for documenting.
You forgot to bring Daniel's ack; however, as I also reviewed and lgtm,
Quoted 6 lines
Documentation/gpu/vkms.rst +0
-0To disable the driver, use :: sudo modprobe -r vkmsSignature · 1 line
2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 15 lines · Sumera Priyadarsini
This patchset aims to lay down some prep work before configfs can be implemented for the vkms driver. The first patch in the series adds a new type
vkms_configto track device configuration. The second and third patch add module testing support for writeback operations.The first patch is developed by Daniel Vetter.
Daniel Vetter (1):
drm/vkms: Addvkms_configtypeSumera Priyadarsini (3):
drm/vkms: Addvkms_configtype
drm/vkms: Add support for writeback module
drm/vkms: Add information about module options
Quoted 5 lines
Documentation/gpu/vkms.rst | 12 ++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 45 ++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_drv.h | 13 +++++++-- drivers/gpu/drm/vkms/vkms_output.c | 13 +++++---- 4 files changed, 68 insertions(+), 15 deletions(-)
Applied to drm-misc-next.
I fixed the extra line issue while applying.
Thanks for your patches,
Melissa
Quoted 10 lines
---
Changes in v2:
- add Co-developed-by tagChanges in v3:
- correct usage of Co-developed by tag(Melissa)
- addenable_writeback_feature(Melissa)
- modify commit message(Melissa)
Quoted 10 lines
Changes in v4:
- split previous patch into patchset(Melissa)
- fix checkpatch issue(Melissa)
- update docs(Daniel)Changes in v5:
- modify docs patch(Daniel)Signature · 1 line
2.25.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel