drm/vkms: Add writeback encoders as possible clones
PATCH v2 1/1 drm/vkms: Add writeback encoders as possible clones
Since commit 41b4b11da0215 ("drm: Add valid clones check") setting the possible_clones values is a hard requirement for cloning. vkms supports cloning for writeback connectors in order to capture CRTC content, however that broke with said commit.
Writeback connectors are created on a per-CRTC basis, thus mark every non-writeback connector that is compatible with a given CRTC as possible clone - and vice-versa.
Using a default configuration, the corresponding drm_info output changes from:
├───Encoders
│ ├───Encoder 0
│ │ ├───Object ID: 40
│ │ ├───Type: virtual
│ │ ├───CRTCS: {0}
│ │ └───Clones: {0}
│ └───Encoder 1
│ ├───Object ID: 41
│ ├───Type: virtual
│ ├───CRTCS: {0}
│ └───Clones: {1}to:
├───Encoders
│ ├───Encoder 0
│ │ ├───Object ID: 44
│ │ ├───Type: virtual
│ │ ├───CRTCS: {0}
│ │ └───Clones: {0, 1}
│ └───Encoder 1
│ ├───Object ID: 50
│ ├───Type: virtual
│ ├───CRTCS: {0}
│ └───Clones: {0, 1}--- drivers/gpu/drm/vkms/vkms_output.c | 13 +++++++++++++ drivers/gpu/drm/vkms/vkms_writeback.c | 2 ++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/vkms/vkms_output.c +13 -0
@@ -77,9 +77,22 @@ int vkms_output_init(struct vkms_device *vkmsdev)return ret; } + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); +vkms_config_encoder_for_each_possible_crtc (encoder_cfg, idx, possible_crtc) { encoder_cfg->encoder->possible_crtcs |=drm_crtc_mask (&possible_crtc->crtc->crtc); + +if (vkms_config_crtc_get_writeback (possible_crtc)) { +struct drm_encoder *wb_encoder = + &possible_crtc->crtc->wb_encoder; + + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (wb_encoder); + wb_encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); + } } }
drivers/gpu/drm/vkms/vkms_writeback.c +2 -0
@@ -174,6 +174,8 @@ int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,if (ret)return ret; vkms_output->wb_encoder.possible_crtcs |=drm_crtc_mask (&vkms_output->crtc); + vkms_output->wb_encoder.possible_clones |= +drm_encoder_mask (&vkms_output->wb_encoder);drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 1 line
2.50.1
Hey Louis, would you be fine to add your Rb on this one? :) Would love to get it into drm-next / 6.17.
Quoted 85 lines · Robert Mader
Since commit
41b4b11da0215("drm: Add valid clones check") setting thepossible_clonesvalues is a hard requirement for cloning.vkmssupports cloning for writeback connectors in order to capture CRTC content, however that broke with said commit.Writeback connectors are created on a per-CRTC basis, thus mark every non-writeback connector that is compatible with a given CRTC as possible clone - and vice-versa.
Using a default configuration, the corresponding
drm_infooutput changes from:├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 40 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0} │ └───Encoder 1 │ ├───Object ID: 41 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {1}to:
├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 44 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0, 1} │ └───Encoder 1 │ ├───Object ID: 50 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {0, 1}Fixes dbd9d80c1b2e (drm/vkms: Add support for writeback)Signed-off-by Robert Mader <[email protected]>--- drivers/gpu/drm/vkms/vkms_output.c | 13 +++++++++++++ drivers/gpu/drm/vkms/vkms_writeback.c | 2 ++ 2 files changed, 15 insertions(+)drivers/gpu/drm/vkms/vkms_output.c +13
-0@@ -77,9 +77,22 @@ int vkms_output_init(struct vkms_device *vkmsdev)return ret; } + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); +vkms_config_encoder_for_each_possible_crtc (encoder_cfg, idx, possible_crtc) { encoder_cfg->encoder->possible_crtcs |=drm_crtc_mask (&possible_crtc->crtc->crtc); + +if (vkms_config_crtc_get_writeback (possible_crtc)) { +struct drm_encoder *wb_encoder = + &possible_crtc->crtc->wb_encoder; + + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (wb_encoder); + wb_encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); + } } }drivers/gpu/drm/vkms/vkms_writeback.c +2
-0@@ -174,6 +174,8 @@ int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,if (ret)return ret; vkms_output->wb_encoder.possible_crtcs |=drm_crtc_mask (&vkms_output->crtc); + vkms_output->wb_encoder.possible_clones |= +drm_encoder_mask (&vkms_output->wb_encoder);drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 6 lines
Robert Mader Consultant Software Developer Collabora Ltd. Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, UK Registered in England & Wales, no. 5513718
Oops, sorry, I just tested it, it works
Le 31/07/2025 à 12:45, Robert Mader a écrit :
Quoted 90 lines
Hey Louis, would you be fine to add your Rb on this one? :) Would love to get it into drm-next / 6.17.
Quoted 85 lines · Robert Mader
Since commit
41b4b11da0215("drm: Add valid clones check") setting thepossible_clonesvalues is a hard requirement for cloning.vkmssupports cloning for writeback connectors in order to capture CRTC content, however that broke with said commit.Writeback connectors are created on a per-CRTC basis, thus mark every non-writeback connector that is compatible with a given CRTC as possible clone - and vice-versa.
Using a default configuration, the corresponding
drm_infooutput changes from:├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 40 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0} │ └───Encoder 1 │ ├───Object ID: 41 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {1}to:
├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 44 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0, 1} │ └───Encoder 1 │ ├───Object ID: 50 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {0, 1}Fixes dbd9d80c1b2e (drm/vkms: Add support for writeback)Signed-off-by Robert Mader <[email protected]>--- drivers/gpu/drm/vkms/vkms_output.c | 13 +++++++++++++ drivers/gpu/drm/vkms/vkms_writeback.c | 2 ++ 2 files changed, 15 insertions(+)drivers/gpu/drm/vkms/vkms_output.c +13
-0@@ -77,9 +77,22 @@ int vkms_output_init(struct vkms_device *vkmsdev)return ret; } + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); +vkms_config_encoder_for_each_possible_crtc (encoder_cfg, idx, possible_crtc) { encoder_cfg->encoder->possible_crtcs |=drm_crtc_mask (&possible_crtc->crtc->crtc); + +if (vkms_config_crtc_get_writeback (possible_crtc)) { +struct drm_encoder *wb_encoder = + &possible_crtc->crtc->wb_encoder; + + encoder_cfg->encoder->possible_clones |= +drm_encoder_mask (wb_encoder); + wb_encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); + } } }drivers/gpu/drm/vkms/vkms_writeback.c +2
-0@@ -174,6 +174,8 @@ int vkms_enable_writeback_connector(struct vkms_device *vkmsdev,if (ret)return ret; vkms_output->wb_encoder.possible_crtcs |=drm_crtc_mask (&vkms_output->crtc); + vkms_output->wb_encoder.possible_clones |= +drm_encoder_mask (&vkms_output->wb_encoder);drm_connector_helper_add (&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 3 lines
Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 3 lines · Louis Chauvet
Oops, sorry, I just tested it, it works
Reviewed-by Louis Chauvet <[email protected]>
Nice, thank a lot!
Quick follow-up: do you think it could already be included in drm-misc-next? And if so, could you do that?
Best regards
Quoted 90 lines
Le 31/07/2025 à 12:45, Robert Mader a écrit :
Quoted 87 lines
Hey Louis, would you be fine to add your Rb on this one? :) Would love to get it into drm-next / 6.17.
Quoted 82 lines · Robert Mader
Since commit
41b4b11da0215("drm: Add valid clones check") setting thepossible_clonesvalues is a hard requirement for cloning.vkmssupports cloning for writeback connectors in order to capture CRTC content, however that broke with said commit.Writeback connectors are created on a per-CRTC basis, thus mark every non-writeback connector that is compatible with a given CRTC as possible clone - and vice-versa.
Using a default configuration, the corresponding
drm_infooutput changes from:├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 40 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0} │ └───Encoder 1 │ ├───Object ID: 41 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {1}to:
├───Encoders │ ├───Encoder 0 │ │ ├───Object ID: 44 │ │ ├───Type: virtual │ │ ├───CRTCS: {0} │ │ └───Clones: {0, 1} │ └───Encoder 1 │ ├───Object ID: 50 │ ├───Type: virtual │ ├───CRTCS: {0} │ └───Clones: {0, 1}Fixes dbd9d80c1b2e (drm/vkms: Add support for writeback)Signed-off-by Robert Mader <[email protected]>---
drivers/gpu/drm/vkms/vkms_output.c | 13 +++++++++++++drivers/gpu/drm/vkms/vkms_writeback.c| 2 ++2 files changed, 15 insertions(+)drivers/gpu/drm/vkms/vkms_output.c +0
-0@@ -77,9 +77,22 @@ int vkms_output_init(struct vkms_device *vkmsdev) return ret; }+
encoder_cfg->encoder->possible_clones|=
+drm_encoder_mask(encoder_cfg->encoder);
+vkms_config_encoder_for_each_possible_crtc(encoder_cfg, idx, possible_crtc){encoder_cfg->encoder->possible_crtcs|=drm_crtc_mask(&possible_crtc->crtc->crtc);drivers/gpu/drm/vkms/vkms_output.c +10
-0+ + if (vkms_config_crtc_get_writeback(possible_crtc)) { + struct drm_encoder *wb_encoder = + &possible_crtc->crtc->wb_encoder; + + encoder_cfg->encoder->possible_clones |= + drm_encoder_mask(wb_encoder); + wb_encoder->possible_clones |= +drm_encoder_mask (encoder_cfg->encoder); + }}
}
diff --gita/drivers/gpu/drm/vkms/vkms_writeback.cb/drivers/gpu/drm/vkms/vkms_writeback.cindexfe163271d5b5..45d69a3b85f6100644drivers/gpu/drm/vkms/vkms_writeback.c +2
-0@@ -174,6 +174,8 @@ int vkms_enable_writeback_connector(structvkms_device *vkmsdev, if (ret) return ret; vkms_output->wb_encoder.possible_crtcs |= drm_crtc_mask(&vkms_output->crtc); + vkms_output->wb_encoder.possible_clones |= + drm_encoder_mask(&vkms_output->wb_encoder); drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs);
Signature · 6 lines
Robert Mader Consultant Software Developer Collabora Ltd. Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, UK Registered in England & Wales, no. 5513718
Quoted 10 lines · Robert Mader
Since commit
41b4b11da0215("drm: Add valid clones check") setting thepossible_clonesvalues is a hard requirement for cloning.vkmssupports cloning for writeback connectors in order to capture CRTC content, however that broke with said commit.Writeback connectors are created on a per-CRTC basis, thus mark every non-writeback connector that is compatible with a given CRTC as possible clone - and vice-versa.
[...]
Applied, thanks!
[1/1] drm/vkms: Add writeback encoders as possible clones
commit: 934452cbb16e1e3609ba52acb48c503b9aaf3154
Best regards,
Signature · 1 line
Louis Chauvet <[email protected]>