summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
diff options
context:
space:
mode:
authorTony Cheng2017-07-12 15:00:14 +0200
committerAlex Deucher2017-09-27 00:15:08 +0200
commit38917a1eb2748021fc0fd2ed4fd9b7f583713916 (patch)
tree6d1d951aa6ef8478c390f149212b87e81e9d1183 /drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
parentdrm/amd/display: fix 4k@30 with 10bit deep color and avi for BT2020 (diff)
downloadkernel-qcow2-linux-38917a1eb2748021fc0fd2ed4fd9b7f583713916.tar.gz
kernel-qcow2-linux-38917a1eb2748021fc0fd2ed4fd9b7f583713916.tar.xz
kernel-qcow2-linux-38917a1eb2748021fc0fd2ed4fd9b7f583713916.zip
drm/amd/display: ensure OTG is locked before proceeding
also remove tg lock at init_hw as not all OTG is running Signed-off-by: Tony Cheng <tony.cheng@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
index e1899f5fb083..12d7f3570cfa 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_timing_generator.c
@@ -573,6 +573,10 @@ static void tgn10_lock(struct timing_generator *tg)
OTG_MASTER_UPDATE_LOCK_SEL, tg->inst);
REG_SET(OTG_MASTER_UPDATE_LOCK, 0,
OTG_MASTER_UPDATE_LOCK, 1);
+
+ REG_WAIT(OTG_MASTER_UPDATE_LOCK,
+ UPDATE_LOCK_STATUS, 1,
+ 1, 100);
}
static void tgn10_unlock(struct timing_generator *tg)