forked from mirrors/linux
		
	CRTC creation uses drmm_crtc_init_with_planes(), which automatically
handles cleanup. However, an unnecessary call to drm_crtc_cleanup() is
still present in the vkms_output_init() error path.
Fixes: 99cc528ebe ("drm/vkms: Use drmm_crtc_init_with_planes()")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Reviewed-by: Maíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241031183835.3633-1-jose.exposito89@gmail.com
Acked-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
		
	
			
		
			
				
	
	
		
			135 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			135 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
// SPDX-License-Identifier: GPL-2.0+
 | 
						|
 | 
						|
#include "vkms_drv.h"
 | 
						|
#include <drm/drm_atomic_helper.h>
 | 
						|
#include <drm/drm_edid.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,
 | 
						|
};
 | 
						|
 | 
						|
static const struct drm_encoder_funcs vkms_encoder_funcs = {
 | 
						|
	.destroy = drm_encoder_cleanup,
 | 
						|
};
 | 
						|
 | 
						|
static int vkms_conn_get_modes(struct drm_connector *connector)
 | 
						|
{
 | 
						|
	int count;
 | 
						|
 | 
						|
	/* Use the default modes list from DRM */
 | 
						|
	count = drm_add_modes_noedid(connector, XRES_MAX, YRES_MAX);
 | 
						|
	drm_set_preferred_mode(connector, XRES_DEF, YRES_DEF);
 | 
						|
 | 
						|
	return count;
 | 
						|
}
 | 
						|
 | 
						|
static const struct drm_connector_helper_funcs vkms_conn_helper_funcs = {
 | 
						|
	.get_modes    = vkms_conn_get_modes,
 | 
						|
};
 | 
						|
 | 
						|
static int vkms_add_overlay_plane(struct vkms_device *vkmsdev, int index,
 | 
						|
				  struct drm_crtc *crtc)
 | 
						|
{
 | 
						|
	struct vkms_plane *overlay;
 | 
						|
 | 
						|
	overlay = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_OVERLAY, index);
 | 
						|
	if (IS_ERR(overlay))
 | 
						|
		return PTR_ERR(overlay);
 | 
						|
 | 
						|
	if (!overlay->base.possible_crtcs)
 | 
						|
		overlay->base.possible_crtcs = drm_crtc_mask(crtc);
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
int vkms_output_init(struct vkms_device *vkmsdev, int index)
 | 
						|
{
 | 
						|
	struct vkms_output *output = &vkmsdev->output;
 | 
						|
	struct drm_device *dev = &vkmsdev->drm;
 | 
						|
	struct drm_connector *connector = &output->connector;
 | 
						|
	struct drm_encoder *encoder = &output->encoder;
 | 
						|
	struct drm_crtc *crtc = &output->crtc;
 | 
						|
	struct vkms_plane *primary, *cursor = NULL;
 | 
						|
	int ret;
 | 
						|
	int writeback;
 | 
						|
	unsigned int n;
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Initialize used plane. One primary plane is required to perform the composition.
 | 
						|
	 *
 | 
						|
	 * The overlay and cursor planes are not mandatory, but can be used to perform complex
 | 
						|
	 * composition.
 | 
						|
	 */
 | 
						|
	primary = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_PRIMARY, index);
 | 
						|
	if (IS_ERR(primary))
 | 
						|
		return PTR_ERR(primary);
 | 
						|
 | 
						|
	if (vkmsdev->config->overlay) {
 | 
						|
		for (n = 0; n < NUM_OVERLAY_PLANES; n++) {
 | 
						|
			ret = vkms_add_overlay_plane(vkmsdev, index, crtc);
 | 
						|
			if (ret)
 | 
						|
				return ret;
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	if (vkmsdev->config->cursor) {
 | 
						|
		cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index);
 | 
						|
		if (IS_ERR(cursor))
 | 
						|
			return PTR_ERR(cursor);
 | 
						|
	}
 | 
						|
 | 
						|
	/* [1]: Allocation of a CRTC, its index will be BIT(0) = 1 */
 | 
						|
	ret = vkms_crtc_init(dev, crtc, &primary->base, &cursor->base);
 | 
						|
	if (ret)
 | 
						|
		return ret;
 | 
						|
 | 
						|
	ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
 | 
						|
				 DRM_MODE_CONNECTOR_VIRTUAL);
 | 
						|
	if (ret) {
 | 
						|
		DRM_ERROR("Failed to init connector\n");
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
 | 
						|
 | 
						|
	ret = drm_encoder_init(dev, encoder, &vkms_encoder_funcs,
 | 
						|
			       DRM_MODE_ENCODER_VIRTUAL, NULL);
 | 
						|
	if (ret) {
 | 
						|
		DRM_ERROR("Failed to init encoder\n");
 | 
						|
		goto err_encoder;
 | 
						|
	}
 | 
						|
	/*
 | 
						|
	 * This is a hardcoded value to select crtc for the encoder.
 | 
						|
	 * BIT(0) here designate the first registered CRTC, the one allocated in [1]
 | 
						|
	 */
 | 
						|
	encoder->possible_crtcs = BIT(0);
 | 
						|
 | 
						|
	ret = drm_connector_attach_encoder(connector, encoder);
 | 
						|
	if (ret) {
 | 
						|
		DRM_ERROR("Failed to attach connector to encoder\n");
 | 
						|
		goto err_attach;
 | 
						|
	}
 | 
						|
 | 
						|
	if (vkmsdev->config->writeback) {
 | 
						|
		writeback = vkms_enable_writeback_connector(vkmsdev);
 | 
						|
		if (writeback)
 | 
						|
			DRM_ERROR("Failed to init writeback connector\n");
 | 
						|
	}
 | 
						|
 | 
						|
	drm_mode_config_reset(dev);
 | 
						|
 | 
						|
	return 0;
 | 
						|
 | 
						|
err_attach:
 | 
						|
	drm_encoder_cleanup(encoder);
 | 
						|
 | 
						|
err_encoder:
 | 
						|
	drm_connector_cleanup(connector);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 |