Unverified Commit 0a3f3f7c authored by Louis Chauvet's avatar Louis Chauvet
Browse files

drm/vkms: Switch to managed for connector 



The current VKMS driver uses non-managed function to create connectors. It
is not an issue yet, but in order to support multiple devices easily,
convert this code to use drm and device managed helpers.

Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Reviewed-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250116-google-vkms-managed-v9-1-3e4ae1bd05a0@bootlin.com


Signed-off-by: default avatarLouis Chauvet <louis.chauvet@bootlin.com>
parent cdb73451

drivers/gpu/drm/vkms/vkms_output.c

+4 −8
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
#include "vkms_drv.h"

#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_managed.h>

#include <drm/drm_probe_helper.h>



static const struct drm_connector_funcs vkms_connector_funcs = {

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -75,8 +75,8 @@ int vkms_output_init(struct vkms_device *vkmsdev) 
		}

	}



	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,

				 DRM_MODE_CONNECTOR_VIRTUAL);

	ret = drmm_connector_init(dev, connector, &vkms_connector_funcs,

				  DRM_MODE_CONNECTOR_VIRTUAL, NULL);

	if (ret) {

		DRM_ERROR("Failed to init connector\n");

		return ret;
@@ -88,7 +88,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) 
			       DRM_MODE_ENCODER_VIRTUAL, NULL);

	if (ret) {

		DRM_ERROR("Failed to init encoder\n");

		goto err_encoder;

		return ret;

	}

	encoder->possible_crtcs = drm_crtc_mask(crtc);
@@ -110,9 +110,5 @@ int vkms_output_init(struct vkms_device *vkmsdev) 


err_attach:

	drm_encoder_cleanup(encoder);



err_encoder:

	drm_connector_cleanup(connector);



	return ret;

}