Commit 03db8f25 authored by Michael Riesch's avatar Michael Riesch Committed by Heiko Stuebner

drm/rockchip: rgb: add video_port parameter to init function

The VOP2 driver has more than one video port, hence the hard-coded
port id will not work anymore. Add an extra parameter for the video
port id to the rockchip_rgb_init function.
Signed-off-by: default avatarMichael Riesch <michael.riesch@wolfvision.net>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230124054706.3921383-4-michael.riesch@wolfvision.net
parent f8a852f1
...@@ -2221,7 +2221,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data) ...@@ -2221,7 +2221,7 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
goto err_disable_pm_runtime; goto err_disable_pm_runtime;
if (vop->data->feature & VOP_FEATURE_INTERNAL_RGB) { if (vop->data->feature & VOP_FEATURE_INTERNAL_RGB) {
vop->rgb = rockchip_rgb_init(dev, &vop->crtc, vop->drm_dev); vop->rgb = rockchip_rgb_init(dev, &vop->crtc, vop->drm_dev, 0);
if (IS_ERR(vop->rgb)) { if (IS_ERR(vop->rgb)) {
ret = PTR_ERR(vop->rgb); ret = PTR_ERR(vop->rgb);
goto err_disable_pm_runtime; goto err_disable_pm_runtime;
......
...@@ -72,7 +72,8 @@ struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = { ...@@ -72,7 +72,8 @@ struct drm_encoder_helper_funcs rockchip_rgb_encoder_helper_funcs = {
struct rockchip_rgb *rockchip_rgb_init(struct device *dev, struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
struct drm_crtc *crtc, struct drm_crtc *crtc,
struct drm_device *drm_dev) struct drm_device *drm_dev,
int video_port)
{ {
struct rockchip_rgb *rgb; struct rockchip_rgb *rgb;
struct drm_encoder *encoder; struct drm_encoder *encoder;
...@@ -90,7 +91,7 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, ...@@ -90,7 +91,7 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
rgb->dev = dev; rgb->dev = dev;
rgb->drm_dev = drm_dev; rgb->drm_dev = drm_dev;
port = of_graph_get_port_by_id(dev->of_node, 0); port = of_graph_get_port_by_id(dev->of_node, video_port);
if (!port) if (!port)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
...@@ -103,8 +104,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev, ...@@ -103,8 +104,8 @@ struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
continue; continue;
child_count++; child_count++;
ret = drm_of_find_panel_or_bridge(dev->of_node, 0, endpoint_id, ret = drm_of_find_panel_or_bridge(dev->of_node, video_port,
&panel, &bridge); endpoint_id, &panel, &bridge);
if (!ret) { if (!ret) {
of_node_put(endpoint); of_node_put(endpoint);
break; break;
......
...@@ -8,12 +8,14 @@ ...@@ -8,12 +8,14 @@
#ifdef CONFIG_ROCKCHIP_RGB #ifdef CONFIG_ROCKCHIP_RGB
struct rockchip_rgb *rockchip_rgb_init(struct device *dev, struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
struct drm_crtc *crtc, struct drm_crtc *crtc,
struct drm_device *drm_dev); struct drm_device *drm_dev,
int video_port);
void rockchip_rgb_fini(struct rockchip_rgb *rgb); void rockchip_rgb_fini(struct rockchip_rgb *rgb);
#else #else
static inline struct rockchip_rgb *rockchip_rgb_init(struct device *dev, static inline struct rockchip_rgb *rockchip_rgb_init(struct device *dev,
struct drm_crtc *crtc, struct drm_crtc *crtc,
struct drm_device *drm_dev) struct drm_device *drm_dev,
int video_port)
{ {
return NULL; return NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment