drm/mediatek: Use simple encoder (b534c4f5) · Commits · 戴 / test

drivers/gpu/drm/mediatek/mtk_dpi.c

+3 −11

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <drm/drm_bridge.h>
		#include <drm/drm_crtc.h>
		#include <drm/drm_of.h>
		#include <drm/drm_simple_kms_helper.h>

		#include "mtk_dpi_regs.h"
		#include "mtk_drm_ddp_comp.h"
		@@ -509,15 +510,6 @@ static int mtk_dpi_set_display_mode(struct mtk_dpi *dpi,
		return 0;
		}

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

		static const struct drm_encoder_funcs mtk_dpi_encoder_funcs = {
		.destroy = mtk_dpi_encoder_destroy,
		};

		static bool mtk_dpi_encoder_mode_fixup(struct drm_encoder *encoder,
		const struct drm_display_mode *mode,
		struct drm_display_mode *adjusted_mode)
		@@ -596,8 +588,8 @@ static int mtk_dpi_bind(struct device dev, struct device master, void *data)
		return ret;
		}

		ret = drm_encoder_init(drm_dev, &dpi->encoder, &mtk_dpi_encoder_funcs,
		DRM_MODE_ENCODER_TMDS, NULL);
		ret = drm_simple_encoder_init(drm_dev, &dpi->encoder,
		DRM_MODE_ENCODER_TMDS);
		if (ret) {
		dev_err(dev, "Failed to initialize decoder: %d\n", ret);
		goto err_unregister;

+3 −11

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include <drm/drm_panel.h>
		#include <drm/drm_print.h>
		#include <drm/drm_probe_helper.h>
		#include <drm/drm_simple_kms_helper.h>

		#include "mtk_drm_ddp_comp.h"

		@@ -787,15 +788,6 @@ static void mtk_output_dsi_disable(struct mtk_dsi *dsi)
		dsi->enabled = false;
		}

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

		static const struct drm_encoder_funcs mtk_dsi_encoder_funcs = {
		.destroy = mtk_dsi_encoder_destroy,
		};

		static bool mtk_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
		const struct drm_display_mode *mode,
		struct drm_display_mode *adjusted_mode)
		@@ -888,8 +880,8 @@ static int mtk_dsi_create_conn_enc(struct drm_device drm, struct mtk_dsi dsi)
		{
		int ret;

		ret = drm_encoder_init(drm, &dsi->encoder, &mtk_dsi_encoder_funcs,
		DRM_MODE_ENCODER_DSI, NULL);
		ret = drm_simple_encoder_init(drm, &dsi->encoder,
		DRM_MODE_ENCODER_DSI);
		if (ret) {
		DRM_ERROR("Failed to encoder init to drm\n");
		return ret;