drm/vkms: Switch to allocated for drm objects
Louis Chauvet
maintainerv2 cover drm/vkms: Switch to allocated for drm objects
Specific allocations for each DRM object is not strictly needed in VKMS right now, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per DRM object.
There is no need for a dynamic allocation for the writeback connector as there can only be one per CRTC
No functionnal changes are intented in this series.
This series requires [1] to switch vkms objects to drm-managed objects.
[1]:https://lore.kernel.org/all/[email protected]/
---
Changes in v2:
- Rebased on drm-misc-next
- Apply comments from Jose
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Louis Chauvet (4):
drm/vkms: Switch to dynamic allocation for connector drm/vkms: Switch to dynamic allocation for encoder drm/vkms: Switch to dynamic allocation for CRTC drm/vkms: Rename vkms_output to vkms_crtc
drivers/gpu/drm/vkms/vkms_composer.c | 30 +++++----- drivers/gpu/drm/vkms/vkms_crtc.c | 100 ++++++++++++++++++---------------- drivers/gpu/drm/vkms/vkms_drv.h | 21 ++++--- drivers/gpu/drm/vkms/vkms_output.c | 41 +++++++++----- drivers/gpu/drm/vkms/vkms_writeback.c | 25 +++++---- 5 files changed, 118 insertions(+), 99 deletions(-)
---
base-commit: 98efdd02e220fea84c1491012d7292749a71faeb
change-id: 20240909-b4-vkms-allocated-9f5508f4444a
prerequisite-message-id: [email protected]
prerequisite-patch-id: b608594ad493a41000ee703792eac4b23f9e35dc
prerequisite-patch-id: 5697aa87c44bbf3eda8a1ba424465dc792545d4c
prerequisite-patch-id: 223d59c407ce28dacf3f563b5c0148d2398303f1
prerequisite-patch-id: 720b75b21d06ce3d3f060fb9238f7903834da0e1
prerequisite-patch-id: 30a1e033fa43241ca6a43006fd4f29f8e9217224
Best regards,
Signature · 1 line
Louis Chauvet <[email protected]>
Louis Chauvet
maintainerPATCH v2 1/4 drm/vkms: Switch to dynamic allocation for connector
A specific allocation for the connector is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per connector.
--- drivers/gpu/drm/vkms/vkms_drv.h | 1 - drivers/gpu/drm/vkms/vkms_output.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +0 -1
@@ -177,7 +177,6 @@ struct vkms_crtc_state {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;
drivers/gpu/drm/vkms/vkms_output.c +7 -1
@@ -32,7 +32,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) {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, *overlay, *cursor =NULL ;
@@ -71,6 +71,12 @@ int vkms_output_init(struct vkms_device *vkmsdev) } } + connector =drmm_kzalloc (dev,sizeof (*connector),GFP_KERNEL ); +if (!connector) { +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) {
Signature · 1 line
2.47.0
Re: [PATCH v2 1/4] drm/vkms: Switch to dynamic allocation for connector
Quoted 7 lines · Louis Chauvet
A specific allocation for the connector is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per connector.
[ ... ]
Thanks!
Maxime
Louis Chauvet
maintainerPATCH v2 2/4 drm/vkms: Switch to dynamic allocation for encoder
In reply to Louis ChauvetA specific allocation for the encoder is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per encoder.
--- drivers/gpu/drm/vkms/vkms_drv.h | 1 - drivers/gpu/drm/vkms/vkms_output.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_drv.h +0 -1
@@ -176,7 +176,6 @@ struct vkms_crtc_state {*/ 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;
drivers/gpu/drm/vkms/vkms_output.c +6 -1
@@ -33,7 +33,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)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, *overlay, *cursor =NULL ;int ret;
@@ -86,6 +86,11 @@ int vkms_output_init(struct vkms_device *vkmsdev)drm_connector_helper_add (connector, &vkms_conn_helper_funcs); + encoder =drmm_kzalloc (dev,sizeof (*encoder),GFP_KERNEL ); +if (!encoder) { +DRM_ERROR ("Failed to allocate encoder\n" ); +return -ENOMEM ; + } ret =drmm_encoder_init (dev, encoder,NULL ,DRM_MODE_ENCODER_VIRTUAL ,NULL );if (ret) {
Signature · 1 line
2.47.0
Re: [PATCH v2 2/4] drm/vkms: Switch to dynamic allocation for encoder
Quoted 7 lines · Louis Chauvet
A specific allocation for the encoder is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per encoder.
Signed-off-by Louis Chauvet <[email protected]>[ ... ]
Thanks!
Maxime
Louis Chauvet
maintainerPATCH v2 3/4 drm/vkms: Switch to dynamic allocation for CRTC
In reply to Louis Chauvetspecific allocation for the CRTC is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per CRTC.
--- drivers/gpu/drm/vkms/vkms_crtc.c | 32 +++++++++++++++++--------------- drivers/gpu/drm/vkms/vkms_drv.h | 9 +++++---- drivers/gpu/drm/vkms/vkms_output.c | 26 +++++++++++++++----------- drivers/gpu/drm/vkms/vkms_writeback.c | 17 +++++++++-------- 4 files changed, 46 insertions(+), 38 deletions(-)
drivers/gpu/drm/vkms/vkms_crtc.c +17 -15
@@ -84,9 +84,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error, ktime_t *vblank_time, 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_output *output = drm_crtc_to_vkms_output(crtc);struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc);if (!READ_ONCE (vblank->enabled)) {
@@ -279,25 +277,29 @@ static void vkms_crtc_destroy_workqueue(struct drm_device *dev,destroy_workqueue (vkms_out->composer_workq); } -int vkms_crtc_init (struct drm_device *dev,struct drm_crtc *crtc, -struct drm_plane *primary,struct drm_plane *cursor) +struct vkms_output *vkms_crtc_init (struct drm_device *dev,struct drm_plane *primary, +struct drm_plane *cursor) { -struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); +struct vkms_output *vkms_out; +struct drm_crtc *crtc;int ret; - ret =drmm_crtc_init_with_planes (dev, crtc, primary, cursor, - &vkms_crtc_funcs,NULL ); -if (ret) { -DRM_ERROR ("Failed to init CRTC\n" ); -return ret; + vkms_out = drmm_crtc_alloc_with_planes(dev, struct vkms_output, crtc, + primary, cursor, + &vkms_crtc_funcs,NULL ); +if (IS_ERR (vkms_out)) { +DRM_DEV_ERROR (dev->dev,"Failed to init CRTC\n" ); +return vkms_out; } + crtc = &vkms_out->crtc; +drm_crtc_helper_add (crtc, &vkms_crtc_helper_funcs); ret =drm_mode_crtc_set_gamma_size (crtc,VKMS_LUT_SIZE );if (ret) {DRM_ERROR ("Failed to set gamma size\n" ); -return ret; +return ERR_PTR (ret); }drm_crtc_enable_color_mgmt (crtc,0 , false,VKMS_LUT_SIZE );
@@ -307,12 +309,12 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, vkms_out->composer_workq =alloc_ordered_workqueue ("vkms_composer" ,0 );if (!vkms_out->composer_workq) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); ret =drmm_add_action_or_reset (dev, vkms_crtc_destroy_workqueue, vkms_out);if (ret) -return ret; +return ERR_PTR (ret); -return ret; +return vkms_out; }
drivers/gpu/drm/vkms/vkms_drv.h +5 -4
@@ -214,7 +214,6 @@ struct vkms_config {struct vkms_device {struct drm_device drm;struct platform_device *platform; -struct vkms_output output;const struct vkms_config *config; };
@@ -241,8 +240,9 @@ struct vkms_device {* @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_output *vkms_crtc_init (struct drm_device *dev, +struct drm_plane *primary, +struct drm_plane *cursor);/** * vkms_output_init() - Initialize all sub-components needed for a VKMS device.
@@ -273,6 +273,7 @@ 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 vkms_output *vkms_out);#endif /* _VKMS_DRV_H_ */
drivers/gpu/drm/vkms/vkms_output.c +15 -11
@@ -30,11 +30,10 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {int vkms_output_init (struct vkms_device *vkmsdev) { -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_output *output;struct vkms_plane *primary, *overlay, *cursor =NULL ;int ret;int writeback;
@@ -56,9 +55,12 @@ int vkms_output_init(struct vkms_device *vkmsdev)return PTR_ERR (cursor); } - ret =vkms_crtc_init (dev, crtc, &primary->base, &cursor->base); -if (ret) -return ret; + output =vkms_crtc_init (dev, &primary->base, + cursor ? &cursor->base :NULL ); +if (IS_ERR (output)) { +DRM_ERROR ("Failed to allocate CRTC\n" ); +return PTR_ERR (output); + }if (vkmsdev->config->overlay) {for (n =0 ; n <NUM_OVERLAY_PLANES ; n++) {
@@ -67,7 +69,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_DEV_ERROR (dev->dev,"Failed to init vkms plane\n" );return PTR_ERR (overlay); } - overlay->base.possible_crtcs =drm_crtc_mask (crtc); + overlay->base.possible_crtcs =drm_crtc_mask (&output->crtc); } }
@@ -97,23 +99,25 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_ERROR ("Failed to init encoder\n" );return ret; } - encoder->possible_crtcs =drm_crtc_mask (crtc); + encoder->possible_crtcs =drm_crtc_mask (&output->crtc); +/* 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); -if (writeback) + writeback =vkms_enable_writeback_connector (vkmsdev, output); +if (writeback) {DRM_ERROR ("Failed to init writeback connector\n" ); +return ret; + } }drm_mode_config_reset (dev);return 0 ; - -return ret; }
drivers/gpu/drm/vkms/vkms_writeback.c +9 -8
@@ -105,7 +105,9 @@ 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_output *vkms_output =container_of (connector, + struct vkms_output, + wb_connector);if (!job->fb)return ;
@@ -114,8 +116,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_output, false);kfree (vkmsjob); }
@@ -124,8 +125,7 @@ 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_output *output =drm_crtc_to_vkms_output (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;
@@ -139,7 +139,7 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,if (!conn_state)return ; -vkms_set_composer (&vkmsdev->output, true); +vkms_set_composer (output, true); active_wb = conn_state->writeback_job->priv; wb_frame_info = &active_wb->wb_frame_info;
@@ -162,9 +162,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_output *vkms_output) { -struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; +struct drm_writeback_connector *wb = &vkms_output->wb_connector;drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 1 line
2.47.0
Maxime Ripard
maintainerRe: [PATCH v2 3/4] drm/vkms: Switch to dynamic allocation for CRTC
Hi,
Quoted 5 lines · Louis Chauvet
specific allocation for the CRTC is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per CRTC.
Signed-off-by Louis Chauvet <[email protected]>
This one should probably be split further, there's several things going on right now.
Quoted 90 lines
--- drivers/gpu/drm/vkms/vkms_crtc.c | 32 +++++++++++++++++--------------- drivers/gpu/drm/vkms/vkms_drv.h | 9 +++++---- drivers/gpu/drm/vkms/vkms_output.c | 26 +++++++++++++++----------- drivers/gpu/drm/vkms/vkms_writeback.c | 17 +++++++++-------- 4 files changed, 46 insertions(+), 38 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +17
-15@@ -84,9 +84,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error, ktime_t *vblank_time, 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_output *output = drm_crtc_to_vkms_output(crtc);struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc);if (!READ_ONCE (vblank->enabled)) {@@ -279,25 +277,29 @@ static void vkms_crtc_destroy_workqueue(struct drm_device *dev,destroy_workqueue (vkms_out->composer_workq); } -int vkms_crtc_init (struct drm_device *dev,struct drm_crtc *crtc, -struct drm_plane *primary,struct drm_plane *cursor) +struct vkms_output *vkms_crtc_init (struct drm_device *dev,struct drm_plane *primary, +struct drm_plane *cursor) { -struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); +struct vkms_output *vkms_out; +struct drm_crtc *crtc;int ret; - ret =drmm_crtc_init_with_planes (dev, crtc, primary, cursor, - &vkms_crtc_funcs,NULL ); -if (ret) { -DRM_ERROR ("Failed to init CRTC\n" ); -return ret; + vkms_out = drmm_crtc_alloc_with_planes(dev, struct vkms_output, crtc, + primary, cursor, + &vkms_crtc_funcs,NULL ); +if (IS_ERR (vkms_out)) { +DRM_DEV_ERROR (dev->dev,"Failed to init CRTC\n" ); +return vkms_out; } + crtc = &vkms_out->crtc; +drm_crtc_helper_add (crtc, &vkms_crtc_helper_funcs); ret =drm_mode_crtc_set_gamma_size (crtc,VKMS_LUT_SIZE );if (ret) {DRM_ERROR ("Failed to set gamma size\n" ); -return ret; +return ERR_PTR (ret); }drm_crtc_enable_color_mgmt (crtc,0 , false,VKMS_LUT_SIZE );@@ -307,12 +309,12 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, vkms_out->composer_workq =alloc_ordered_workqueue ("vkms_composer" ,0 );if (!vkms_out->composer_workq) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); ret =drmm_add_action_or_reset (dev, vkms_crtc_destroy_workqueue, vkms_out);if (ret) -return ret; +return ERR_PTR (ret); -return ret; +return vkms_out; }drivers/gpu/drm/vkms/vkms_drv.h +0
-1@@ -214,7 +214,6 @@ struct vkms_config {struct vkms_device {struct drm_device drm;struct platform_device *platform; -struct vkms_output output;const struct vkms_config *config; };
drivers/gpu/drm/vkms/vkms_drv.h struct vkms_device { · line 245
Quoted 8 lines
drivers/gpu/drm/vkms/vkms_drv.h +3
-2@@ -241,8 +240,9 @@ struct vkms_device {* @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_output *vkms_crtc_init (struct drm_device *dev, +struct drm_plane *primary, +struct drm_plane *cursor);
You also need to update the doc.
Maxime
PATCH v2 3/4 drm/vkms: Switch to dynamic allocation for CRTC
In reply to Louis ChauvetHi Louis,
Patches 1 and 2:
I noticed a bug in this patch:
Quoted 169 lines
A specific allocation for the CRTC is not strictly necessary at this point, but in order to implement dynamic configuration of VKMS (configFS), it will be easier to have one allocation per CRTC.
Signed-off-by Louis Chauvet <[email protected]>--- drivers/gpu/drm/vkms/vkms_crtc.c | 32 +++++++++++++++++--------------- drivers/gpu/drm/vkms/vkms_drv.h | 9 +++++---- drivers/gpu/drm/vkms/vkms_output.c | 26 +++++++++++++++----------- drivers/gpu/drm/vkms/vkms_writeback.c | 17 +++++++++-------- 4 files changed, 46 insertions(+), 38 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +17
-15@@ -84,9 +84,7 @@ static bool vkms_get_vblank_timestamp(struct drm_crtc *crtc, int *max_error, ktime_t *vblank_time, 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_output *output = drm_crtc_to_vkms_output(crtc);struct drm_vblank_crtc *vblank =drm_crtc_vblank_crtc (crtc);if (!READ_ONCE (vblank->enabled)) {@@ -279,25 +277,29 @@ static void vkms_crtc_destroy_workqueue(struct drm_device *dev,destroy_workqueue (vkms_out->composer_workq); } -int vkms_crtc_init (struct drm_device *dev,struct drm_crtc *crtc, -struct drm_plane *primary,struct drm_plane *cursor) +struct vkms_output *vkms_crtc_init (struct drm_device *dev,struct drm_plane *primary, +struct drm_plane *cursor) { -struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); +struct vkms_output *vkms_out; +struct drm_crtc *crtc;int ret; - ret =drmm_crtc_init_with_planes (dev, crtc, primary, cursor, - &vkms_crtc_funcs,NULL ); -if (ret) { -DRM_ERROR ("Failed to init CRTC\n" ); -return ret; + vkms_out = drmm_crtc_alloc_with_planes(dev, struct vkms_output, crtc, + primary, cursor, + &vkms_crtc_funcs,NULL ); +if (IS_ERR (vkms_out)) { +DRM_DEV_ERROR (dev->dev,"Failed to init CRTC\n" ); +return vkms_out; } + crtc = &vkms_out->crtc; +drm_crtc_helper_add (crtc, &vkms_crtc_helper_funcs); ret =drm_mode_crtc_set_gamma_size (crtc,VKMS_LUT_SIZE );if (ret) {DRM_ERROR ("Failed to set gamma size\n" ); -return ret; +return ERR_PTR (ret); }drm_crtc_enable_color_mgmt (crtc,0 , false,VKMS_LUT_SIZE );@@ -307,12 +309,12 @@ int vkms_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, vkms_out->composer_workq =alloc_ordered_workqueue ("vkms_composer" ,0 );if (!vkms_out->composer_workq) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); ret =drmm_add_action_or_reset (dev, vkms_crtc_destroy_workqueue, vkms_out);if (ret) -return ret; +return ERR_PTR (ret); -return ret; +return vkms_out; }drivers/gpu/drm/vkms/vkms_drv.h +5
-4@@ -214,7 +214,6 @@ struct vkms_config {struct vkms_device {struct drm_device drm;struct platform_device *platform; -struct vkms_output output;const struct vkms_config *config; };@@ -241,8 +240,9 @@ struct vkms_device {* @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_output *vkms_crtc_init (struct drm_device *dev, +struct drm_plane *primary, +struct drm_plane *cursor);/** * vkms_output_init() - Initialize all sub-components needed for a VKMS device. @@ -273,6 +273,7 @@ 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 vkms_output *vkms_out);#endif /* _VKMS_DRV_H_ */ drivers/gpu/drm/vkms/vkms_output.c +10
-7@@ -30,11 +30,10 @@ static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {int vkms_output_init (struct vkms_device *vkmsdev) { -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_output *output;struct vkms_plane *primary, *overlay, *cursor =NULL ;int ret;int writeback;@@ -56,9 +55,12 @@ int vkms_output_init(struct vkms_device *vkmsdev)return PTR_ERR (cursor); } - ret =vkms_crtc_init (dev, crtc, &primary->base, &cursor->base); -if (ret) -return ret; + output =vkms_crtc_init (dev, &primary->base, + cursor ? &cursor->base :NULL ); +if (IS_ERR (output)) { +DRM_ERROR ("Failed to allocate CRTC\n" ); +return PTR_ERR (output); + }if (vkmsdev->config->overlay) {for (n =0 ; n <NUM_OVERLAY_PLANES ; n++) {@@ -67,7 +69,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_DEV_ERROR (dev->dev,"Failed to init vkms plane\n" );return PTR_ERR (overlay); } - overlay->base.possible_crtcs =drm_crtc_mask (crtc); + overlay->base.possible_crtcs =drm_crtc_mask (&output->crtc); } }@@ -97,23 +99,25 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_ERROR ("Failed to init encoder\n" );return ret; } - encoder->possible_crtcs =drm_crtc_mask (crtc); + encoder->possible_crtcs =drm_crtc_mask (&output->crtc); +/* 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;
drivers/gpu/drm/vkms/vkms_output.c int vkms_output_init(struct vkms_device *vkmsdev) · line 116
Quoted 10 lines
drivers/gpu/drm/vkms/vkms_output.c +4
-2} +/* Initialize the writeback component */ if (vkmsdev->config->writeback) { - writeback =vkms_enable_writeback_connector (vkmsdev); -if (writeback) + writeback =vkms_enable_writeback_connector (vkmsdev, output); +if (writeback) {DRM_ERROR ("Failed to init writeback connector\n" ); +return ret;
In case of error "if (writeback)", you are returning "ret", which must be 0 at this point.
I'm not sure if it is a bug using the wrong variable or you want to keep the previous behaviour. If that's the case, the code used the call drm_mode_config_reset() before this change.
Quoted 67 lines
drivers/gpu/drm/vkms/vkms_output.c +1
-2+ } }drm_mode_config_reset (dev);return 0 ; - -return ret; }drivers/gpu/drm/vkms/vkms_writeback.c +9
-8@@ -105,7 +105,9 @@ 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_output *vkms_output =container_of (connector, + struct vkms_output, + wb_connector);if (!job->fb)return ;@@ -114,8 +116,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_output, false);kfree (vkmsjob); }@@ -124,8 +125,7 @@ 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_output *output =drm_crtc_to_vkms_output (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;@@ -139,7 +139,7 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,if (!conn_state)return ; -vkms_set_composer (&vkmsdev->output, true); +vkms_set_composer (output, true); active_wb = conn_state->writeback_job->priv; wb_frame_info = &active_wb->wb_frame_info;@@ -162,9 +162,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_output *vkms_output) { -struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; +struct drm_writeback_connector *wb = &vkms_output->wb_connector;drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Louis Chauvet
maintainerPATCH v2 4/4 drm/vkms: Rename vkms_output to vkms_crtc
In reply to Louis ChauvetThe current vkms_output structure only contains crtc-related members. To avoid confusion, rename the structure to vkms_crtc and all its usage.
--- drivers/gpu/drm/vkms/vkms_composer.c | 30 ++++++------ drivers/gpu/drm/vkms/vkms_crtc.c | 90 ++++++++++++++++++----------------- drivers/gpu/drm/vkms/vkms_drv.h | 18 +++---- drivers/gpu/drm/vkms/vkms_output.c | 16 +++---- drivers/gpu/drm/vkms/vkms_writeback.c | 24 +++++----- 5 files changed, 90 insertions(+), 88 deletions(-)
drivers/gpu/drm/vkms/vkms_composer.c +15 -15
@@ -495,13 +495,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_output *out =drm_crtc_to_vkms_output (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;
@@ -525,7 +525,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
@@ -543,10 +543,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); }/*
@@ -596,31 +596,31 @@ 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 *vkms_crtc,bool enabled) {bool old_enabled;if (enabled) -drm_crtc_vblank_get (&out->crtc); +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->crtc); +drm_crtc_vblank_put (&vkms_crtc->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 *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; }
drivers/gpu/drm/vkms/vkms_crtc.c +46 -44
206 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_drv.h +9 -9
@@ -174,8 +174,8 @@ struct vkms_crtc_state {* @composer_state: Protected by @lock, current state of this VKMS output * @composer_lock: Lock used internally to protect @composer_state members */ -struct vkms_output { -struct drm_crtc crtc; +struct vkms_crtc { +struct drm_crtc base;struct drm_writeback_connector wb_connector;struct hrtimer vblank_hrtimer;ktime_t period_ns;
@@ -221,8 +221,8 @@ 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_crtc_to_vkms_crtc (target) \ + container_of(target, struct vkms_crtc, base)#define drm_device_to_vkms_device (target) \ container_of(target, struct vkms_device, drm)
@@ -240,9 +240,9 @@ struct vkms_device {* @primary: primary plane to attach to the CRTC * @cursor: plane to attach to the CRTC */ -struct vkms_output *vkms_crtc_init (struct drm_device *dev, -struct drm_plane *primary, -struct drm_plane *cursor); +struct vkms_crtc *vkms_crtc_init (struct drm_device *dev, +struct drm_plane *primary, +struct drm_plane *cursor);/** * vkms_output_init() - Initialize all sub-components needed for a VKMS device.
@@ -269,11 +269,11 @@ int vkms_verify_crc_source(struct drm_crtc *crtc, const char *source_name,/* Composer Support */ 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);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, -struct vkms_output *vkms_out); +struct vkms_crtc *vkms_crtc);#endif /* _VKMS_DRV_H_ */
drivers/gpu/drm/vkms/vkms_output.c +8 -8
@@ -33,7 +33,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)struct drm_device *dev = &vkmsdev->drm;struct drm_connector *connector;struct drm_encoder *encoder; -struct vkms_output *output; +struct vkms_crtc *vkms_crtc;struct vkms_plane *primary, *overlay, *cursor =NULL ;int ret;int writeback;
@@ -55,11 +55,11 @@ int vkms_output_init(struct vkms_device *vkmsdev)return PTR_ERR (cursor); } - output =vkms_crtc_init (dev, &primary->base, - cursor ? &cursor->base :NULL ); -if (IS_ERR (output)) { + vkms_crtc =vkms_crtc_init (dev, &primary->base, + cursor ? &cursor->base :NULL ); +if (IS_ERR (vkms_crtc)) {DRM_ERROR ("Failed to allocate CRTC\n" ); -return PTR_ERR (output); +return PTR_ERR (vkms_crtc); }if (vkmsdev->config->overlay) {
@@ -69,7 +69,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_DEV_ERROR (dev->dev,"Failed to init vkms plane\n" );return PTR_ERR (overlay); } - overlay->base.possible_crtcs =drm_crtc_mask (&output->crtc); + overlay->base.possible_crtcs =drm_crtc_mask (&vkms_crtc->base); } }
@@ -99,7 +99,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)DRM_ERROR ("Failed to init encoder\n" );return ret; } - encoder->possible_crtcs =drm_crtc_mask (&output->crtc); + encoder->possible_crtcs =drm_crtc_mask (&vkms_crtc->base);/* Attach the encoder and the connector */ ret =drm_connector_attach_encoder (connector, encoder);
@@ -110,7 +110,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)/* Initialize the writeback component */ if (vkmsdev->config->writeback) { - writeback =vkms_enable_writeback_connector (vkmsdev, output); + writeback =vkms_enable_writeback_connector (vkmsdev, vkms_crtc);if (writeback) {DRM_ERROR ("Failed to init writeback connector\n" );return ret;
drivers/gpu/drm/vkms/vkms_writeback.c +12 -12
@@ -105,9 +105,9 @@ 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_output *vkms_output =container_of (connector, - struct vkms_output, - wb_connector); +struct vkms_crtc *vkms_crtc =container_of (connector, + struct vkms_crtc, + wb_connector);if (!job->fb)return ;
@@ -116,7 +116,7 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector,drm_framebuffer_put (vkmsjob->wb_frame_info.fb); -vkms_set_composer (vkms_output, false); +vkms_set_composer (vkms_crtc, false);kfree (vkmsjob); }
@@ -125,10 +125,10 @@ 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_output *output =drm_crtc_to_vkms_output (connector_state->crtc); -struct drm_writeback_connector *wb_conn = &output->wb_connector; +struct vkms_crtc *vkms_crtc =drm_crtc_to_vkms_crtc (connector_state->crtc); +struct drm_writeback_connector *wb_conn = &vkms_crtc->wb_connector;struct drm_connector_state *conn_state = wb_conn->base.state; -struct vkms_crtc_state *crtc_state = output->composer_state; +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.mode.vdisplay;u16 crtc_width = crtc_state->base.mode.hdisplay;
@@ -139,15 +139,15 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn,if (!conn_state)return ; -vkms_set_composer (output, true); +vkms_set_composer (vkms_crtc, true); active_wb = conn_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_function (wb_format);drm_rect_init (&wb_frame_info->src,0 ,0 , crtc_width, crtc_height);
@@ -163,9 +163,9 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = { };int vkms_enable_writeback_connector (struct vkms_device *vkmsdev, -struct vkms_output *vkms_output) +struct vkms_crtc *vkms_crtc) { -struct drm_writeback_connector *wb = &vkms_output->wb_connector; +struct drm_writeback_connector *wb = &vkms_crtc->wb_connector;drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 1 line
2.47.0
Maxime Ripard
maintainerRe: [PATCH v2 4/4] drm/vkms: Rename vkms_output to vkms_crtc
Quoted 1 line · Louis Chauvet
The current
vkms_outputstructure only contains crtc-related members.
That's not true though? There's a connector, the connector's workqueue, etc. in there.
Maxime