drm/qxl: Use simple encoder (6f2bb119) · Commits · 戴 / test

drivers/gpu/drm/qxl/qxl_display.c

+14 −15

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include <drm/drm_gem_framebuffer_helper.h>
		#include <drm/drm_plane_helper.h>
		#include <drm/drm_probe_helper.h>
		#include <drm/drm_simple_kms_helper.h>

		#include "qxl_drv.h"
		#include "qxl_object.h"
		@@ -1007,9 +1008,6 @@ static struct drm_encoder qxl_best_encoder(struct drm_connector connector)
		return &qxl_output->enc;
		}

		static const struct drm_encoder_helper_funcs qxl_enc_helper_funcs = {
		};

		static const struct drm_connector_helper_funcs qxl_connector_helper_funcs = {
		.get_modes = qxl_conn_get_modes,
		.mode_valid = qxl_conn_mode_valid,
		@@ -1059,15 +1057,6 @@ static const struct drm_connector_funcs qxl_connector_funcs = {
		.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
		};

		static void qxl_enc_destroy(struct drm_encoder *encoder)
		{
		drm_encoder_cleanup(encoder);
		}

		static const struct drm_encoder_funcs qxl_enc_funcs = {
		.destroy = qxl_enc_destroy,
		};

		static int qxl_mode_create_hotplug_mode_update_property(struct qxl_device *qdev)
		{
		if (qdev->hotplug_mode_update_property)
		@@ -1086,6 +1075,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
		struct qxl_output *qxl_output;
		struct drm_connector *connector;
		struct drm_encoder *encoder;
		int ret;

		qxl_output = kzalloc(sizeof(struct qxl_output), GFP_KERNEL);
		if (!qxl_output)
		@@ -1098,15 +1088,19 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
		drm_connector_init(dev, &qxl_output->base,
		&qxl_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL);

		drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs,
		DRM_MODE_ENCODER_VIRTUAL, NULL);
		ret = drm_simple_encoder_init(dev, &qxl_output->enc,
		DRM_MODE_ENCODER_VIRTUAL);
		if (ret) {
		drm_err(dev, "drm_simple_encoder_init() failed, error %d\n",
		ret);
		goto err_drm_connector_cleanup;
		}

		/* we get HPD via client monitors config */
		connector->polled = DRM_CONNECTOR_POLL_HPD;
		encoder->possible_crtcs = 1 << num_output;
		drm_connector_attach_encoder(&qxl_output->base,
		&qxl_output->enc);
		drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs);
		drm_connector_helper_add(connector, &qxl_connector_helper_funcs);

		drm_object_attach_property(&connector->base,
		@@ -1116,6 +1110,11 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
		drm_object_attach_property(&connector->base,
		dev->mode_config.suggested_y_property, 0);
		return 0;

		err_drm_connector_cleanup:
		drm_connector_cleanup(&qxl_output->base);
		kfree(qxl_output);
		return ret;
		}

		static struct drm_framebuffer *

Admin message