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

drm/rockchip: lvds: Fix encoder and connector type

Browse Source 
Change-Id: I35c06179306502859e1d1a01f95c5cb1d688baae
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi
2018-11-26 10:41:23 +08:00
committed by Tao Huang
parent da0896f658
commit 74ff2ba980
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,7 +407,11 @@ rockchip_lvds_encoder_atomic_check(struct drm_encoder *encoder,
struct drm_display_info *info = &connector->display_info;
struct rockchip_lvds *lvds = encoder_to_lvds(encoder);
s->output_type = DRM_MODE_CONNECTOR_LVDS;
if (lvds->output == DISPLAY_OUTPUT_RGB)
s->output_type = DRM_MODE_CONNECTOR_DPI;
else
s->output_type = DRM_MODE_CONNECTOR_LVDS;
if (info->num_bus_formats)
s->bus_format = info->bus_formats[0];
else
@@ -589,7 +593,9 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
dev->of_node);
ret = drm_encoder_init(drm_dev, encoder, &rockchip_lvds_encoder_funcs,
DRM_MODE_ENCODER_LVDS, NULL);
(lvds->output == DISPLAY_OUTPUT_RGB) ?
DRM_MODE_ENCODER_DPI : DRM_MODE_ENCODER_LVDS,
NULL);
if (ret < 0) {
DRM_ERROR("failed to initialize encoder with drm\n");
goto err_put_remote;
@@ -602,6 +608,8 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
connector = &lvds->connector;
ret = drm_connector_init(drm_dev, connector,
&rockchip_lvds_connector_funcs,
(lvds->output == DISPLAY_OUTPUT_RGB) ?
DRM_MODE_CONNECTOR_DPI :
DRM_MODE_CONNECTOR_LVDS);
if (ret < 0) {
DRM_ERROR("failed to initialize connector with drm\n");