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

drm/rockchip: lvds: register sub dev at rockchip lvds driver

Browse Source 
At lvds to other display output type product, the connector maybe
register at third party drivers, the sub dev register often be forgot, so we add
sub dev register at rockchip lvds driver.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: If075041df8ddb1b269c903d092a6263160eff1db
This commit is contained in:
Sandy Huang
2024-01-03 17:58:57 +08:00
committed by Huang Jiachai
parent 1ebaed6daf
commit 8ed148210d
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,7 +494,8 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
struct rockchip_lvds *lvds = dev_get_drvdata(dev);
struct drm_device *drm_dev = data;
struct drm_encoder *encoder = &lvds->encoder;
struct drm_connector *connector = &lvds->connector;
struct drm_connector *connector = NULL;
struct rockchip_drm_private *private = drm_dev->dev_private;
int ret;
/*
@@ -522,8 +523,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
drm_encoder_helper_add(encoder, &rockchip_lvds_encoder_helper_funcs);
if (lvds->panel) {
struct rockchip_drm_private *private = drm_dev->dev_private;
connector = &lvds->connector;
ret = drm_connector_init(drm_dev, connector,
&rockchip_lvds_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
@@ -551,19 +551,29 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
"failed to attach encoder: %d\n", ret);
goto err_free_connector;
}
lvds->sub_dev.connector = &lvds->connector;
lvds->sub_dev.of_node = lvds->dev->of_node;
lvds->sub_dev.loader_protect = rockchip_lvds_encoder_loader_protect;
rockchip_drm_register_sub_dev(&lvds->sub_dev);
drm_object_attach_property(&connector->base, private->connector_id_prop, 0);
} else {
struct list_head *connector_list;
ret = drm_bridge_attach(encoder, lvds->bridge, NULL, 0);
if (ret) {
DRM_DEV_ERROR(lvds->dev,
"failed to attach bridge: %d\n", ret);
goto err_free_encoder;
}
connector_list = &lvds->bridge->dev->mode_config.connector_list;
list_for_each_entry(connector, connector_list, head)
if (drm_connector_has_possible_encoder(connector, &lvds->encoder))
break;
}
if (connector) {
lvds->sub_dev.connector = connector;
lvds->sub_dev.of_node = lvds->dev->of_node;
lvds->sub_dev.loader_protect = rockchip_lvds_encoder_loader_protect;
drm_object_attach_property(&connector->base, private->connector_id_prop, lvds->id);
rockchip_drm_register_sub_dev(&lvds->sub_dev);
}
return 0;