drm/vkms: Add basic CRTC initialization (854502fa) · Commits · 戴 / test

drivers/gpu/drm/vkms/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	vkms-y := vkms_drv.o		vkms-y := vkms_drv.o vkms_plane.o vkms_output.o vkms_crtc.o

	obj-$(CONFIG_DRM_VKMS) += vkms.o		obj-$(CONFIG_DRM_VKMS) += vkms.o

drivers/gpu/drm/vkms/vkms_crtc.c

0 → 100644

+35 −0

Original line number	Original line	Diff line number	Diff line
			// SPDX-License-Identifier: GPL-2.0
			/*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License as published by
			* the Free Software Foundation; either version 2 of the License, or
			* (at your option) any later version.
			*/

			#include "vkms_drv.h"
			#include <drm/drm_atomic_helper.h>
			#include <drm/drm_crtc_helper.h>

			static const struct drm_crtc_funcs vkms_crtc_funcs = {
			.set_config = drm_atomic_helper_set_config,
			.destroy = drm_crtc_cleanup,
			.page_flip = drm_atomic_helper_page_flip,
			.reset = drm_atomic_helper_crtc_reset,
			.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
			.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
			};

			int vkms_crtc_init(struct drm_device dev, struct drm_crtc crtc,
			struct drm_plane primary, struct drm_plane cursor)
			{
			int ret;

			ret = drm_crtc_init_with_planes(dev, crtc, primary, cursor,
			&vkms_crtc_funcs, NULL);
			if (ret) {
			DRM_ERROR("Failed to init CRTC\n");
			return ret;
			}

			return ret;
			}

drivers/gpu/drm/vkms/vkms_drv.c

+17 −43

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,6 @@
	*/		*/

	#include <linux/module.h>		#include <linux/module.h>
	#include <drm/drmP.h>
	#include <drm/drm_gem.h>		#include <drm/drm_gem.h>
	#include <drm/drm_crtc_helper.h>		#include <drm/drm_crtc_helper.h>
	#include <drm/drm_atomic_helper.h>		#include <drm/drm_atomic_helper.h>
	@@ -59,25 +58,24 @@ static struct drm_driver vkms_driver = {
	.minor = DRIVER_MINOR,		.minor = DRIVER_MINOR,
	};		};

	static const u32 vkms_formats[] = {		static const struct drm_mode_config_funcs vkms_mode_funcs = {
	DRM_FORMAT_XRGB8888,		.atomic_check = drm_atomic_helper_check,
			.atomic_commit = drm_atomic_helper_commit,
	};		};

	static void vkms_connector_destroy(struct drm_connector *connector)		static int vkms_modeset_init(struct vkms_device *vkmsdev)
	{		{
	drm_connector_unregister(connector);		struct drm_device *dev = &vkmsdev->drm;
	drm_connector_cleanup(connector);
	}

	static const struct drm_connector_funcs vkms_connector_funcs = {		drm_mode_config_init(dev);
	.fill_modes = drm_helper_probe_single_connector_modes,		dev->mode_config.funcs = &vkms_mode_funcs;
	.destroy = vkms_connector_destroy,		dev->mode_config.min_width = XRES_MIN;
	};		dev->mode_config.min_height = YRES_MIN;
			dev->mode_config.max_width = XRES_MAX;
			dev->mode_config.max_height = YRES_MAX;

	static const struct drm_mode_config_funcs vkms_mode_funcs = {		return vkms_output_init(vkmsdev);
	.atomic_check = drm_atomic_helper_check,		}
	.atomic_commit = drm_atomic_helper_commit,
	};

	static int __init vkms_init(void)		static int __init vkms_init(void)
	{		{
	@@ -98,48 +96,24 @@ static int __init vkms_init(void)
	goto out_fini;		goto out_fini;
	}		}

	drm_mode_config_init(&vkms_device->drm);		ret = vkms_modeset_init(vkms_device);
	vkms_device->drm.mode_config.funcs = &vkms_mode_funcs;		if (ret)
	vkms_device->drm.mode_config.min_width = XRES_MIN;
	vkms_device->drm.mode_config.min_height = YRES_MIN;
	vkms_device->drm.mode_config.max_width = XRES_MAX;
	vkms_device->drm.mode_config.max_height = YRES_MAX;

	ret = drm_connector_init(&vkms_device->drm, &vkms_device->connector,
	&vkms_connector_funcs,
	DRM_MODE_CONNECTOR_VIRTUAL);
	if (ret < 0) {
	DRM_ERROR("Failed to init connector\n");
	goto out_unregister;
	}

	ret = drm_simple_display_pipe_init(&vkms_device->drm,
	&vkms_device->pipe,
	NULL,
	vkms_formats,
	ARRAY_SIZE(vkms_formats),
	NULL,
	&vkms_device->connector);
	if (ret < 0) {
	DRM_ERROR("Cannot setup simple display pipe\n");
	goto out_unregister;		goto out_unregister;
	}

	ret = drm_dev_register(&vkms_device->drm, 0);		ret = drm_dev_register(&vkms_device->drm, 0);
	if (ret)		if (ret)
	goto out_unregister;		goto out_unregister;

	drm_connector_register(&vkms_device->connector);

	return 0;		return 0;

	out_unregister:		out_unregister:
	platform_device_unregister(vkms_device->platform);		platform_device_unregister(vkms_device->platform);

	out_fini:		out_fini:
	drm_dev_fini(&vkms_device->drm);		drm_dev_fini(&vkms_device->drm);

	out_free:		out_free:
	kfree(vkms_device);		kfree(vkms_device);

	return ret;		return ret;
	}		}

drivers/gpu/drm/vkms/vkms_drv.h

+21 −3

Original line number	Original line	Diff line number	Diff line
	#ifndef _VKMS_DRV_H_		#ifndef _VKMS_DRV_H_
	#define _VKMS_DRV_H_		#define _VKMS_DRV_H_

	#include <drm/drm_simple_kms_helper.h>		#include <drm/drmP.h>
			#include <drm/drm.h>
			#include <drm/drm_encoder.h>

			static const u32 vkms_formats[] = {
			DRM_FORMAT_XRGB8888,
			};

			struct vkms_output {
			struct drm_crtc crtc;
			struct drm_encoder encoder;
			struct drm_connector connector;
			};

	struct vkms_device {		struct vkms_device {
	struct drm_device drm;		struct drm_device drm;
	struct platform_device *platform;		struct platform_device *platform;
	struct drm_simple_display_pipe pipe;		struct vkms_output output;
	struct drm_connector connector;
	};		};

			int vkms_crtc_init(struct drm_device dev, struct drm_crtc crtc,
			struct drm_plane primary, struct drm_plane cursor);

			int vkms_output_init(struct vkms_device *vkmsdev);

			struct drm_plane vkms_plane_init(struct vkms_device vkmsdev);

	#endif /* _VKMS_DRV_H_ */		#endif /* _VKMS_DRV_H_ */

drivers/gpu/drm/vkms/vkms_output.c

0 → 100644

+91 −0

Original line number	Original line	Diff line number	Diff line
			// SPDX-License-Identifier: GPL-2.0
			/*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License as published by
			* the Free Software Foundation; either version 2 of the License, or
			* (at your option) any later version.
			*/

			#include "vkms_drv.h"
			#include <drm/drm_crtc_helper.h>

			static void vkms_connector_destroy(struct drm_connector *connector)
			{
			drm_connector_unregister(connector);
			drm_connector_cleanup(connector);
			}

			static const struct drm_connector_funcs vkms_connector_funcs = {
			.fill_modes = drm_helper_probe_single_connector_modes,
			.destroy = vkms_connector_destroy,
			};

			static const struct drm_encoder_funcs vkms_encoder_funcs = {
			.destroy = drm_encoder_cleanup,
			};

			int vkms_output_init(struct vkms_device *vkmsdev)
			{
			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 drm_plane *primary;
			int ret;

			primary = vkms_plane_init(vkmsdev);
			if (IS_ERR(primary))
			return PTR_ERR(primary);

			ret = vkms_crtc_init(dev, crtc, primary, NULL);
			if (ret)
			goto err_crtc;

			ret = drm_connector_init(dev, connector, &vkms_connector_funcs,
			DRM_MODE_CONNECTOR_VIRTUAL);
			if (ret) {
			DRM_ERROR("Failed to init connector\n");
			goto err_connector;
			}

			ret = drm_connector_register(connector);
			if (ret) {
			DRM_ERROR("Failed to register connector\n");
			goto err_connector_register;
			}

			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;
			}
			encoder->possible_crtcs = 1;

			ret = drm_mode_connector_attach_encoder(connector, encoder);
			if (ret) {
			DRM_ERROR("Failed to attach connector to encoder\n");
			goto err_attach;
			}

			drm_mode_config_reset(dev);

			return 0;

			err_attach:
			drm_encoder_cleanup(encoder);

			err_encoder:
			drm_connector_unregister(connector);

			err_connector_register:
			drm_connector_cleanup(connector);

			err_connector:
			drm_crtc_cleanup(crtc);

			err_crtc:
			drm_plane_cleanup(primary);
			return ret;
			}

Admin message