shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: remove connector and encoder port init

Browse Source 
Change-Id: I6f4e79f37dfc8d59a69b1e35428adaf1d951a310
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2020-07-02 14:32:10 +08:00
committed by Tao Huang
parent 74d0f7fc4b
commit efc84eaf70
10 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/bridge/rk1000.c
View File

@@ -299,8 +299,6 @@ static int rk1000_bridge_attach(struct drm_bridge *bridge)
}
rk1000->encoder = bridge->encoder;
rk1000->connector.port = rk1000->dev->of_node;
drm_connector_helper_add(&rk1000->connector,
&rk1000_connector_helper_funcs);

2
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
View File

@@ -389,8 +389,6 @@ static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp)
struct device *dev = dp->dev;
int ret;
encoder->port = dev->of_node;
encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
dev->of_node);
DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);

3
drivers/gpu/drm/rockchip/dw-mipi-dsi.c
View File

@@ -1487,7 +1487,6 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
return ret;
}
encoder->port = dev->of_node;
encoder->possible_crtcs = drm_of_find_possible_crtcs(drm,
dev->of_node);
/*
@@ -1528,7 +1527,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
DRM_DEV_ERROR(dev, "Failed to attach panel: %d\n", ret);
goto connector_cleanup;
}
connector->port = dev->of_node;
} else {
dsi->bridge->driver_private = &dsi->host;
dsi->bridge->encoder = encoder;

3
drivers/gpu/drm/rockchip/rk618/rk618_dsi.c
View File

@@ -804,13 +804,10 @@ static void rk618_dsi_bridge_mode_set(struct drm_bridge *bridge,
static int rk618_dsi_bridge_attach(struct drm_bridge *bridge)
{
struct rk618_dsi *dsi = bridge_to_dsi(bridge);
struct device *dev = dsi->dev;
struct drm_connector *connector = &dsi->connector;
struct drm_device *drm = bridge->dev;
int ret;
connector->port = dev->of_node;
ret = drm_connector_init(drm, connector, &rk618_dsi_connector_funcs,
DRM_MODE_CONNECTOR_DSI);
if (ret) {

1
drivers/gpu/drm/rockchip/rk618/rk618_hdmi.c
View File

@@ -1080,7 +1080,6 @@ static int rk618_hdmi_bridge_attach(struct drm_bridge *bridge)
int ret;
connector->polled = DRM_CONNECTOR_POLL_HPD;
connector->port = dev->of_node;
ret = drm_connector_init(drm, connector, &rk618_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA);

3
drivers/gpu/drm/rockchip/rk618/rk618_lvds.c
View File

@@ -170,13 +170,10 @@ static void rk618_lvds_bridge_mode_set(struct drm_bridge *bridge,
static int rk618_lvds_bridge_attach(struct drm_bridge *bridge)
{
struct rk618_lvds *lvds = bridge_to_lvds(bridge);
struct device *dev = lvds->dev;
struct drm_connector *connector = &lvds->connector;
struct drm_device *drm = bridge->dev;
int ret;
connector->port = dev->of_node;
ret = drm_connector_init(drm, connector, &rk618_lvds_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
if (ret) {

2
drivers/gpu/drm/rockchip/rk618/rk618_rgb.c
View File

@@ -172,8 +172,6 @@ static int rk618_rgb_bridge_attach(struct drm_bridge *bridge)
int ret;
if (rgb->panel) {
connector->port = dev->of_node;
ret = drm_connector_init(drm, connector,
&rk618_rgb_connector_funcs,
DRM_MODE_CONNECTOR_DPI);

1
drivers/gpu/drm/rockchip/rockchip_drm_tve.c
View File

@@ -522,7 +522,6 @@ static int rockchip_tve_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(encoder, &rockchip_tve_encoder_helper_funcs);
connector = &tve->connector;
connector->port = dev->of_node;
connector->interlace_allowed = 1;
ret = drm_connector_init(drm_dev, connector,
&rockchip_tve_connector_funcs,

3
drivers/gpu/drm/rockchip/rockchip_lvds.c
View File

@@ -273,7 +273,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
if (ret)
return ret;
encoder->port = dev->of_node;
encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
dev->of_node);
@@ -288,8 +287,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs);
if (lvds->panel) {
connector->port = dev->of_node;
ret = drm_connector_init(drm_dev, connector,
&rockchip_lvds_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);

2
drivers/gpu/drm/rockchip/rockchip_rgb.c
View File

@@ -251,7 +251,6 @@ static int rockchip_rgb_bind(struct device *dev, struct device *master,
return ret;
}
encoder->port = dev->of_node;
encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
dev->of_node);
@@ -291,7 +290,6 @@ static int rockchip_rgb_bind(struct device *dev, struct device *master,
DRM_DEV_ERROR(dev, "failed to attach panel: %d\n", ret);
goto err_free_connector;
}
connector->port = dev->of_node;
} else {
rgb->bridge->encoder = encoder;
ret = drm_bridge_attach(encoder, rgb->bridge, NULL);