Commit 540b8f27 authored by Sascha Hauer's avatar Sascha Hauer Committed by Heiko Stuebner
Browse files

drm/rockchip: Embed drm_encoder into rockchip_decoder 



The VOP2 driver needs rockchip specific information for a drm_encoder.

This patch creates a struct rockchip_encoder with a struct drm_encoder
embedded in it. This is used throughout the rockchip driver instead of
struct drm_encoder directly.

The information the VOP2 drivers needs is the of_graph endpoint node
of the encoder. To ease bisectability this is added here.

While at it convert the different encoder-to-driverdata macros to
static inline functions in order to gain type safety and readability.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Tested-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-3-s.hauer@pengutronix.de
parent 3fa50896

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

+21 −11
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 


#define PSR_WAIT_LINE_FLAG_TIMEOUT_MS	100



#define to_dp(nm)	container_of(nm, struct rockchip_dp_device, nm)



/**

 * struct rockchip_dp_chip_data - splite the grf setting of kind of chips

 * @lcdsel_grf_reg: grf register offset of lcdc select
@@ -59,7 +57,7 @@ struct rockchip_dp_chip_data { 
struct rockchip_dp_device {

	struct drm_device        *drm_dev;

	struct device            *dev;

	struct drm_encoder       encoder;

	struct rockchip_encoder  encoder;

	struct drm_display_mode  mode;



	struct clk               *pclk;
@@ -73,6 +71,18 @@ struct rockchip_dp_device { 
	struct analogix_dp_plat_data plat_data;

};



static struct rockchip_dp_device *encoder_to_dp(struct drm_encoder *encoder)

{

	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);



	return container_of(rkencoder, struct rockchip_dp_device, encoder);

}



static struct rockchip_dp_device *pdata_encoder_to_dp(struct analogix_dp_plat_data *plat_data)

{

	return container_of(plat_data, struct rockchip_dp_device, plat_data);

}



static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)

{

	reset_control_assert(dp->rst);
@@ -84,7 +94,7 @@ static int rockchip_dp_pre_init(struct rockchip_dp_device *dp) 


static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data)

{

	struct rockchip_dp_device *dp = to_dp(plat_data);

	struct rockchip_dp_device *dp = pdata_encoder_to_dp(plat_data);

	int ret;



	ret = clk_prepare_enable(dp->pclk);
@@ -105,7 +115,7 @@ static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data) 


static int rockchip_dp_powerdown(struct analogix_dp_plat_data *plat_data)

{

	struct rockchip_dp_device *dp = to_dp(plat_data);

	struct rockchip_dp_device *dp = pdata_encoder_to_dp(plat_data);



	clk_disable_unprepare(dp->pclk);
@@ -166,7 +176,7 @@ struct drm_crtc *rockchip_dp_drm_get_new_crtc(struct drm_encoder *encoder, 
static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder,

					   struct drm_atomic_state *state)

{

	struct rockchip_dp_device *dp = to_dp(encoder);

	struct rockchip_dp_device *dp = encoder_to_dp(encoder);

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state;

	int ret;
@@ -208,7 +218,7 @@ static void rockchip_dp_drm_encoder_enable(struct drm_encoder *encoder, 
static void rockchip_dp_drm_encoder_disable(struct drm_encoder *encoder,

					    struct drm_atomic_state *state)

{

	struct rockchip_dp_device *dp = to_dp(encoder);

	struct rockchip_dp_device *dp = encoder_to_dp(encoder);

	struct drm_crtc *crtc;

	struct drm_crtc_state *new_crtc_state = NULL;

	int ret;
@@ -297,7 +307,7 @@ static int rockchip_dp_of_probe(struct rockchip_dp_device *dp) 


static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp)

{

	struct drm_encoder *encoder = &dp->encoder;

	struct drm_encoder *encoder = &dp->encoder.encoder;

	struct drm_device *drm_dev = dp->drm_dev;

	struct device *dev = dp->dev;

	int ret;
@@ -333,7 +343,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, 
		return ret;

	}



	dp->plat_data.encoder = &dp->encoder;

	dp->plat_data.encoder = &dp->encoder.encoder;



	ret = analogix_dp_bind(dp->adp, drm_dev);

	if (ret)
@@ -341,7 +351,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, 


	return 0;

err_cleanup_encoder:

	dp->encoder.funcs->destroy(&dp->encoder);

	dp->encoder.encoder.funcs->destroy(&dp->encoder.encoder);

	return ret;

}
@@ -351,7 +361,7 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master, 
	struct rockchip_dp_device *dp = dev_get_drvdata(dev);



	analogix_dp_unbind(dp->adp);

	dp->encoder.funcs->destroy(&dp->encoder);

	dp->encoder.encoder.funcs->destroy(&dp->encoder.encoder);

}



static const struct component_ops rockchip_dp_component_ops = {

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

+12 −6
Original line number Diff line number Diff line
@@ -26,11 +26,17 @@ 
#include "cdn-dp-reg.h"

#include "rockchip_drm_vop.h"



#define connector_to_dp(c) \

		container_of(c, struct cdn_dp_device, connector)

static inline struct cdn_dp_device *connector_to_dp(struct drm_connector *connector)

{

	return container_of(connector, struct cdn_dp_device, connector);

}



#define encoder_to_dp(c) \

		container_of(c, struct cdn_dp_device, encoder)

static inline struct cdn_dp_device *encoder_to_dp(struct drm_encoder *encoder)

{

	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);



	return container_of(rkencoder, struct cdn_dp_device, encoder);

}



#define GRF_SOC_CON9		0x6224

#define DP_SEL_VOP_LIT		BIT(12)
@@ -1050,7 +1056,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) 


	INIT_WORK(&dp->event_work, cdn_dp_pd_event_work);



	encoder = &dp->encoder;

	encoder = &dp->encoder.encoder;



	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,

							     dev->of_node);
@@ -1115,7 +1121,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data) 
static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)

{

	struct cdn_dp_device *dp = dev_get_drvdata(dev);

	struct drm_encoder *encoder = &dp->encoder;

	struct drm_encoder *encoder = &dp->encoder.encoder;

	struct drm_connector *connector = &dp->connector;



	cancel_work_sync(&dp->event_work);

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ struct cdn_dp_device { 
	struct device *dev;

	struct drm_device *drm_dev;

	struct drm_connector connector;

	struct drm_encoder encoder;

	struct rockchip_encoder encoder;

	struct drm_display_mode mode;

	struct platform_device *audio_pdev;

	struct work_struct event_work;

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

+11 −6
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ 


#define HIWORD_UPDATE(val, mask)	(val | (mask) << 16)



#define to_dsi(nm)	container_of(nm, struct dw_mipi_dsi_rockchip, nm)



enum {

	DW_DSI_USAGE_IDLE,

	DW_DSI_USAGE_DSI,
@@ -236,7 +234,7 @@ struct rockchip_dw_dsi_chip_data { 


struct dw_mipi_dsi_rockchip {

	struct device *dev;

	struct drm_encoder encoder;

	struct rockchip_encoder encoder;

	void __iomem *base;



	struct regmap *grf_regmap;
@@ -271,6 +269,13 @@ struct dw_mipi_dsi_rockchip { 
	bool dsi_bound;

};



static struct dw_mipi_dsi_rockchip *to_dsi(struct drm_encoder *encoder)

{

	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);



	return container_of(rkencoder, struct dw_mipi_dsi_rockchip, encoder);

}



struct dphy_pll_parameter_map {

	unsigned int max_mbps;

	u8 hsfreqrange;
@@ -770,7 +775,7 @@ static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder) 
	int ret, mux;



	mux = drm_of_encoder_active_endpoint_id(dsi->dev->of_node,

						&dsi->encoder);

						&dsi->encoder.encoder);

	if (mux < 0)

		return;
@@ -801,7 +806,7 @@ dw_mipi_dsi_encoder_helper_funcs = { 
static int rockchip_dsi_drm_create_encoder(struct dw_mipi_dsi_rockchip *dsi,

					   struct drm_device *drm_dev)

{

	struct drm_encoder *encoder = &dsi->encoder;

	struct drm_encoder *encoder = &dsi->encoder.encoder;

	int ret;



	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
@@ -959,7 +964,7 @@ static int dw_mipi_dsi_rockchip_bind(struct device *dev, 
		goto out_pll_clk;

	}



	ret = dw_mipi_dsi_bind(dsi->dmd, &dsi->encoder);

	ret = dw_mipi_dsi_bind(dsi->dmd, &dsi->encoder.encoder);

	if (ret) {

		DRM_DEV_ERROR(dev, "Failed to bind: %d\n", ret);

		goto out_pll_clk;

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

+8 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct rockchip_hdmi_chip_data { 
struct rockchip_hdmi {

	struct device *dev;

	struct regmap *regmap;

	struct drm_encoder encoder;

	struct rockchip_encoder encoder;

	const struct rockchip_hdmi_chip_data *chip_data;

	struct clk *vpll_clk;

	struct clk *grf_clk;
@@ -75,7 +75,12 @@ struct rockchip_hdmi { 
	struct phy *phy;

};



#define to_rockchip_hdmi(x)	container_of(x, struct rockchip_hdmi, x)

static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder)

{

	struct rockchip_encoder *rkencoder = to_rockchip_encoder(encoder);



	return container_of(rkencoder, struct rockchip_hdmi, encoder);

}



static const struct dw_hdmi_mpll_config rockchip_mpll_cfg[] = {

	{
@@ -511,7 +516,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, 
	hdmi->dev = &pdev->dev;

	hdmi->chip_data = plat_data->phy_data;

	plat_data->phy_data = hdmi;

	encoder = &hdmi->encoder;

	encoder = &hdmi->encoder.encoder;



	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node);

	/*