Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16450616 authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/rockchip: remove rockchip_drm_encoder_get_mux_id 



It is replaced by drm_of_encoder_active_endpoint_id.

Suggested-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarYakir Yang <ykk@rock-chips.com>
[for dw_hdmi-rockchip]
Acked-by: default avatarMark Yao <mark.yao@rock-chips.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 53141e42

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -885,7 +885,7 @@ static bool dw_mipi_dsi_encoder_mode_fixup(struct drm_encoder *encoder, 
static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder)

static void dw_mipi_dsi_encoder_commit(struct drm_encoder *encoder)

{

{

	struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);

	struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder);

	int mux  = rockchip_drm_encoder_get_mux_id(dsi->dev->of_node, encoder);

	int mux = drm_of_encoder_active_endpoint_id(dsi->dev->of_node, encoder);

	u32 interface_pix_fmt;

	u32 interface_pix_fmt;

	u32 val;

	u32 val;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -204,7 +204,7 @@ static void dw_hdmi_rockchip_encoder_enable(struct drm_encoder *encoder) 
	rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,

	rockchip_drm_crtc_mode_config(encoder->crtc, DRM_MODE_CONNECTOR_HDMIA,

				      ROCKCHIP_OUT_MODE_AAAA);

				      ROCKCHIP_OUT_MODE_AAAA);





	mux = rockchip_drm_encoder_get_mux_id(hdmi->dev->of_node, encoder);

	mux = drm_of_encoder_active_endpoint_id(hdmi->dev->of_node, encoder);

	if (mux)

	if (mux)

		val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16);

		val = HDMI_SEL_VOP_LIT | (HDMI_SEL_VOP_LIT << 16);

	else

	else

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -384,36 +384,6 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = { 
				rockchip_drm_sys_resume)

				rockchip_drm_sys_resume)

};

};





/*

 * @node: device tree node containing encoder input ports

 * @encoder: drm_encoder

 */

int rockchip_drm_encoder_get_mux_id(struct device_node *node,

				    struct drm_encoder *encoder)

{

	struct device_node *ep;

	struct drm_crtc *crtc = encoder->crtc;

	struct of_endpoint endpoint;

	struct device_node *port;

	int ret;



	if (!node || !crtc)

		return -EINVAL;



	for_each_endpoint_of_node(node, ep) {

		port = of_graph_get_remote_port(ep);

		of_node_put(port);

		if (port == crtc->port) {

			ret = of_graph_parse_endpoint(ep, &endpoint);

			of_node_put(ep);

			return ret ?: endpoint.id;

		}

	}



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(rockchip_drm_encoder_get_mux_id);



static int compare_of(struct device *dev, void *data)

static int compare_of(struct device *dev, void *data)

{

{

	struct device_node *np = data;

	struct device_node *np = data;

drivers/gpu/drm/rockchip/rockchip_drm_drv.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -67,8 +67,6 @@ void rockchip_drm_atomic_work(struct work_struct *work); 
int rockchip_register_crtc_funcs(struct drm_crtc *crtc,

int rockchip_register_crtc_funcs(struct drm_crtc *crtc,

				 const struct rockchip_crtc_funcs *crtc_funcs);

				 const struct rockchip_crtc_funcs *crtc_funcs);

void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);

void rockchip_unregister_crtc_funcs(struct drm_crtc *crtc);

int rockchip_drm_encoder_get_mux_id(struct device_node *node,

				    struct drm_encoder *encoder);

int rockchip_drm_crtc_mode_config(struct drm_crtc *crtc, int connector_type,

int rockchip_drm_crtc_mode_config(struct drm_crtc *crtc, int connector_type,

				  int out_mode);

				  int out_mode);

int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,

int rockchip_drm_dma_attach_device(struct drm_device *drm_dev,