Commit 78476288 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Gerd Hoffmann
Browse files

drm/virtio: plane: use drm managed resources 



Use drm managed resource allocation (drmm_universal_plane_alloc()) in
order to cleanup/simplify drm plane .destroy callback.

Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220714130028.2127858-2-dakr@redhat.com


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4c703f5d

drivers/gpu/drm/virtio/virtgpu_plane.c

+8 −22
Original line number Diff line number Diff line
@@ -67,16 +67,10 @@ uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc) 
	return format;

}



static void virtio_gpu_plane_destroy(struct drm_plane *plane)

{

	drm_plane_cleanup(plane);

	kfree(plane);

}



static const struct drm_plane_funcs virtio_gpu_plane_funcs = {

	.update_plane		= drm_atomic_helper_update_plane,

	.disable_plane		= drm_atomic_helper_disable_plane,

	.destroy		= virtio_gpu_plane_destroy,

	.destroy		= drm_plane_cleanup,

	.reset			= drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state	= drm_atomic_helper_plane_destroy_state,
@@ -379,11 +373,7 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, 
	const struct drm_plane_helper_funcs *funcs;

	struct drm_plane *plane;

	const uint32_t *formats;

	int ret, nformats;



	plane = kzalloc(sizeof(*plane), GFP_KERNEL);

	if (!plane)

		return ERR_PTR(-ENOMEM);

	int nformats;



	if (type == DRM_PLANE_TYPE_CURSOR) {

		formats = virtio_gpu_cursor_formats;
@@ -394,17 +384,13 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, 
		nformats = ARRAY_SIZE(virtio_gpu_formats);

		funcs = &virtio_gpu_primary_helper_funcs;

	}

	ret = drm_universal_plane_init(dev, plane, 1 << index,

				       &virtio_gpu_plane_funcs,

				       formats, nformats,

				       NULL, type, NULL);

	if (ret)

		goto err_plane_init;



	drm_plane_helper_add(plane, funcs);

	plane = drmm_universal_plane_alloc(dev, struct drm_plane, dev,

					   1 << index, &virtio_gpu_plane_funcs,

					   formats, nformats, NULL, type, NULL);

	if (IS_ERR(plane))

		return plane;



err_plane_init:

	kfree(plane);

	return ERR_PTR(ret);

	drm_plane_helper_add(plane, funcs);

	return plane;

}