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

Revert "drm: bridge: analogix: Avoid timeout warnings in analogix_dp_config_video()"

Browse Source 
This reverts commit dd25e35e08.

Change-Id: Id3f886bdfeddf26626087c67cafe263c01ce372d
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi
2018-09-28 11:12:29 +08:00
committed by Tao Huang
parent 2bbddaf948
commit cdda59cd03
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
View File

@@ -651,6 +651,7 @@ static int analogix_dp_set_link_train(struct analogix_dp_device *dp,
static int analogix_dp_config_video(struct analogix_dp_device *dp)
{
int retval = 0;
int timeout_loop = 0;
int done_count = 0;
@@ -687,10 +688,8 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)
/* Configure video slave mode */
analogix_dp_enable_video_master(dp, 0);
/* Enable video input */
analogix_dp_start_video(dp);
timeout_loop = 0;
for (;;) {
timeout_loop++;
if (analogix_dp_is_video_stream_on(dp) == 0) {
@@ -708,7 +707,10 @@ static int analogix_dp_config_video(struct analogix_dp_device *dp)
usleep_range(1000, 1001);
}
return 0;
if (retval != 0)
dev_err(dp->dev, "Video stream is not detected!\n");
return retval;
}
static void analogix_dp_enable_scramble(struct analogix_dp_device *dp,
@@ -811,6 +813,9 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
if (drm_panel_enable(dp->plat_data->panel))
DRM_ERROR("failed to enable the panel\n");
}
/* Enable video */
analogix_dp_start_video(dp);
}
static int analogix_dp_get_modes(struct drm_connector *connector)