Commit 0dbd7354 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/rockchip: Use simple encoder 



The rockchip driver uses empty implementations for its encoders. Replace
the code with the generic simple encoder.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200305155950.2705-13-tzimmermann@suse.de
parent f9b21bde

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+3 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <drm/drm_of.h>

#include <drm/drm_panel.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"
@@ -258,10 +259,6 @@ static struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = { 
	.atomic_check = rockchip_dp_drm_encoder_atomic_check,

};



static struct drm_encoder_funcs rockchip_dp_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int rockchip_dp_of_probe(struct rockchip_dp_device *dp)

{

	struct device *dev = dp->dev;
@@ -309,8 +306,8 @@ static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp) 
							     dev->of_node);

	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);



	ret = drm_encoder_init(drm_dev, encoder, &rockchip_dp_encoder_funcs,

			       DRM_MODE_ENCODER_TMDS, NULL);

	ret = drm_simple_encoder_init(drm_dev, encoder,

				      DRM_MODE_ENCODER_TMDS);

	if (ret) {

		DRM_ERROR("failed to initialize encoder with drm\n");

		return ret;

drivers/gpu/drm/rockchip/cdn-dp-core.c

+3 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "cdn-dp-core.h"

#include "cdn-dp-reg.h"
@@ -689,10 +690,6 @@ static const struct drm_encoder_helper_funcs cdn_dp_encoder_helper_funcs = { 
	.atomic_check = cdn_dp_encoder_atomic_check,

};



static const struct drm_encoder_funcs cdn_dp_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int cdn_dp_parse_dt(struct cdn_dp_device *dp)

{

	struct device *dev = dp->dev;
@@ -1030,8 +1027,8 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) 
							     dev->of_node);

	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);



	ret = drm_encoder_init(drm_dev, encoder, &cdn_dp_encoder_funcs,

			       DRM_MODE_ENCODER_TMDS, NULL);

	ret = drm_simple_encoder_init(drm_dev, encoder,

				      DRM_MODE_ENCODER_TMDS);

	if (ret) {

		DRM_ERROR("failed to initialize encoder with drm\n");

		return ret;

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

+2 −6
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <drm/bridge/dw_mipi_dsi.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_of.h>

#include <drm/drm_simple_kms_helper.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"
@@ -789,10 +790,6 @@ dw_mipi_dsi_encoder_helper_funcs = { 
	.disable = dw_mipi_dsi_encoder_disable,

};



static const struct drm_encoder_funcs dw_mipi_dsi_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi,

					   struct drm_device *drm_dev)

{
@@ -802,8 +799,7 @@ static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi, 
	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,

							     dsi->dev->of_node);



	ret = drm_encoder_init(drm_dev, encoder, &dw_mipi_dsi_encoder_funcs,

			       DRM_MODE_ENCODER_DSI, NULL);

	ret = drm_simple_encoder_init(drm_dev, encoder, DRM_MODE_ENCODER_DSI);

	if (ret) {

		DRM_ERROR("Failed to initialize encoder with drm\n");

		return ret;

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+2 −6
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"
@@ -237,10 +238,6 @@ dw_hdmi_rockchip_mode_valid(struct drm_connector *connector, 
	return (valid) ? MODE_OK : MODE_BAD;

}



static const struct drm_encoder_funcs dw_hdmi_rockchip_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static void dw_hdmi_rockchip_encoder_disable(struct drm_encoder *encoder)

{

}
@@ -546,8 +543,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
	}



	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);

	drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);



	platform_set_drvdata(pdev, hdmi);

drivers/gpu/drm/rockchip/inno_hdmi.c

+2 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>



#include "rockchip_drm_drv.h"

#include "rockchip_drm_vop.h"
@@ -532,10 +533,6 @@ static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = { 
	.atomic_check = inno_hdmi_encoder_atomic_check,

};



static struct drm_encoder_funcs inno_hdmi_encoder_funcs = {

	.destroy = drm_encoder_cleanup,

};



static enum drm_connector_status

inno_hdmi_connector_detect(struct drm_connector *connector, bool force)

{
@@ -617,8 +614,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi) 
		return -EPROBE_DEFER;



	drm_encoder_helper_add(encoder, &inno_hdmi_encoder_helper_funcs);

	drm_encoder_init(drm, encoder, &inno_hdmi_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);

	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);



	hdmi->connector.polled = DRM_CONNECTOR_POLL_HPD;

CRA Git | Maintained and supported by SUSTech CRA and CCSE