Re: [PATCH] drm/virtio: Replace deprecated drm_simple_encoder_init()

[Thomas Zimmermann]

Hi

Am 09.09.26 um 09:34 schrieb Davide Bonatto:

drm_simple_encoder_init() is deprecated as it introduces an unnecessary
intermediate layer between atomic modesetting and DRM drivers.

This helper has meanwhile been removed entirely.

Best regards
Thomas

Inline the helper call in virtgpu_display by defining
virtio_gpu_encoder_funcs with the default drm_encoder_cleanup callback,
and migrate directly to drm_encoder_init()

Signed-off-by: Davide Bonatto <bonatto.dav...@gmail.com>
---
  drivers/gpu/drm/virtio/virtgpu_display.c | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c 
b/drivers/gpu/drm/virtio/virtgpu_display.c
index a1a875a0c706..85986578001f 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -67,6 +67,10 @@ static const struct drm_framebuffer_funcs 
virtio_gpu_fb_funcs = {
        .dirty = drm_atomic_helper_dirtyfb,
  };

+static const struct drm_encoder_funcs virtio_gpu_encoder_funcs = {

+       .destroy = drm_encoder_cleanup,
+};
+
  static int
  virtio_gpu_framebuffer_init(struct drm_device *dev,
                            struct virtio_gpu_framebuffer *vgfb,
@@ -306,7 +310,9 @@ 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;

--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, (HRB 36809, AG Nürnberg)