From: Yongqiang Sun Date: Wed, 14 Dec 2016 21:05:22 +0000 (-0500) Subject: drm/amd/display: Resolved HDMI assert in dal X-Git-Tag: v4.15-rc1~56^2~23^2~852 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b90a2b23edeb1f5181c7baf0ecd305c7e6ab20b4;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Resolved HDMI assert in dal Signed-off-by: Yongqiang Sun Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 842182ce93a87..0590e0a6cd07d 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?