* [PATCH 1/2] drm/virtio: Open-code drm_simple_encoder_init()
2026-09-20 18:42 [PATCH 0/2] drm/virtio: Open-code drm_simple_encoder_init() Sebastian von Arx
@ 2026-09-20 18:42 ` Sebastian von Arx
2026-09-20 19:29 ` sashiko-bot
2026-09-20 18:42 ` [PATCH 2/2] drm/virtio: Propagate drm_encoder_init() errors Sebastian von Arx
1 sibling, 1 reply; 5+ messages in thread
From: Sebastian von Arx @ 2026-09-20 18:42 UTC (permalink / raw)
To: David Airlie, Gerd Hoffmann, Dmitry Osipenko
Cc: Gurchetan Singh, Chia-I Wu, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Simona Vetter, dri-devel, virtualization,
linux-kernel, Sebastian von Arx
drm_simple_encoder_init() only wraps drm_encoder_init() with a
cleanup callback. Open-code the helper in preparation for removing
drm_simple_encoder_init().
Assisted-by: LLM
Signed-off-by: Sebastian von Arx <linux@sebastianvonarx.ch>
---
drivers/gpu/drm/virtio/virtgpu_display.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index a1a875a0c..b01178027 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -271,6 +271,10 @@ static const struct drm_connector_funcs virtio_gpu_connector_funcs = {
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
+static const struct drm_encoder_funcs virtio_gpu_encoder_funcs = {
+ .destroy = drm_encoder_cleanup,
+};
+
static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
{
struct drm_device *dev = vgdev->ddev;
@@ -306,7 +310,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
if (vgdev->has_edid)
drm_connector_attach_edid_property(connector);
- drm_simple_encoder_init(dev, encoder, DRM_MODE_ENCODER_VIRTUAL);
+ drm_encoder_init(dev, encoder, &virtio_gpu_encoder_funcs, DRM_MODE_ENCODER_VIRTUAL, NULL);
drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
encoder->possible_crtcs = 1 << index;
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drm/virtio: Propagate drm_encoder_init() errors
2026-09-20 18:42 [PATCH 0/2] drm/virtio: Open-code drm_simple_encoder_init() Sebastian von Arx
2026-09-20 18:42 ` [PATCH 1/2] " Sebastian von Arx
@ 2026-09-20 18:42 ` Sebastian von Arx
2026-09-20 19:31 ` sashiko-bot
1 sibling, 1 reply; 5+ messages in thread
From: Sebastian von Arx @ 2026-09-20 18:42 UTC (permalink / raw)
To: David Airlie, Gerd Hoffmann, Dmitry Osipenko
Cc: Gurchetan Singh, Chia-I Wu, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Simona Vetter, dri-devel, virtualization,
linux-kernel, Sebastian von Arx
vgdev_output_init() ignores errors from drm_encoder_init(), so output
setup continues even when encoder initialization fails, for example
because of an allocation failure.
Check the return value and propagate the error to the caller.
Assisted-by: LLM
Signed-off-by: Sebastian von Arx <linux@sebastianvonarx.ch>
---
drivers/gpu/drm/virtio/virtgpu_display.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index b01178027..1c790d6a6 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -310,7 +310,11 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
if (vgdev->has_edid)
drm_connector_attach_edid_property(connector);
- drm_encoder_init(dev, encoder, &virtio_gpu_encoder_funcs, DRM_MODE_ENCODER_VIRTUAL, NULL);
+ ret = drm_encoder_init(dev, encoder, &virtio_gpu_encoder_funcs,
+ DRM_MODE_ENCODER_VIRTUAL, NULL);
+ if (ret)
+ return ret;
+
drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
encoder->possible_crtcs = 1 << index;
--
2.55.0
^ permalink raw reply related [flat|nested] 5+ messages in thread