diff options
| author | Danilo Krummrich <dakr@kernel.org> | 2025-09-10 11:07:05 +0200 |
|---|---|---|
| committer | Danilo Krummrich <dakr@kernel.org> | 2025-09-10 11:07:05 +0200 |
| commit | d4dc08c530cbf71fb1c7cddb9d1e7e36bd62e22f (patch) | |
| tree | d26f9c9ffe7168b67ca107d26883b15dcd0cc7e2 /drivers/gpu/drm/vkms/vkms_output.c | |
| parent | 6b35936f058d0cb9171c7be1424b62017b874913 (diff) | |
| parent | 043d9c6928b010be7902a01b5cdfa7d754535b1a (diff) | |
Merge drm-misc-next-2025-08-21 into drm-rust-next
We need the DRM Rust changes that went into drm-misc before the
existence of the drm-rust tree in here as well.
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/vkms/vkms_output.c')
| -rw-r--r-- | drivers/gpu/drm/vkms/vkms_output.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 8d7ca0cdd79f..2ee3749e2b28 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -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); + } } } |