summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYongqiang Sun <yongqiang.sun@amd.com>2016-12-14 16:05:22 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:05:19 -0400
commitb90a2b23edeb1f5181c7baf0ecd305c7e6ab20b4 (patch)
tree536cd2e6e9c95181b7d0d92e31dd7df69adc2a90
parentb264d3455d9c8ce0bea422a04a867f0a724c7770 (diff)
downloadlinux-stable-b90a2b23edeb1f5181c7baf0ecd305c7e6ab20b4.tar.gz
linux-stable-b90a2b23edeb1f5181c7baf0ecd305c7e6ab20b4.tar.bz2
linux-stable-b90a2b23edeb1f5181c7baf0ecd305c7e6ab20b4.zip
drm/amd/display: Resolved HDMI assert in dal
Signed-off-by: Yongqiang Sun <yongqiang.sun@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>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index 842182ce93a8..0590e0a6cd07 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -94,12 +94,12 @@ static void dce110_update_generic_info_packet(
/* poll dig_update_lock is not locked -> asic internal signal
* assume otg master lock will unlock it
*/
- REG_WAIT(AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_LOCK_STATUS,
- 1, 10, max_retries);
+/* REG_WAIT(AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_LOCK_STATUS,
+ 0, 10, max_retries);*/
/* check if HW reading GSP memory */
REG_WAIT(AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_CONFLICT,
- 1, 10, max_retries);
+ 0, 10, max_retries);
/* HW does is not reading GSP memory not reading too long ->
* something wrong. clear GPS memory access and notify?