From: Roman Li Date: Fri, 24 Mar 2017 20:26:09 +0000 (-0400) Subject: drm/amd/display: increase timeout for dmif dealloc X-Git-Tag: v4.15-rc1~56^2~23^2~613 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=940c654e64e1ed70b49ec663f2370a8b4de6d2ac;p=linux.git drm/amd/display: increase timeout for dmif dealloc In some use-cases, e.g. multiple 4K displays, exisitng wait time for reg update of 30msec timed out during mode setiing that sometimes resulted in system bad state as we continue without waiting for registry update complete. Increasing timeout to 35msec fixes that problem. Signed-off-by: Roman Li Acked-by: Harry Wentland Reviewed-by: Tony Cheng Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c index 7acd87152811..884f453d91b0 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c @@ -524,7 +524,7 @@ void dce_mem_input_free_dmif(struct mem_input *mi, REG_WAIT(DMIF_BUFFER_CONTROL, DMIF_BUFFERS_ALLOCATION_COMPLETED, 1, - 10, 0xBB8); + 10, 3500); if (mi->wa.single_head_rdreq_dmif_limit) { uint32_t eanble = (total_stream_num > 1) ? 0 :