From d8ff38d8fcd0a7bb66d17ec689135239aca78532 Mon Sep 17 00:00:00 2001 From: Wyatt Wood Date: Wed, 23 Feb 2022 11:22:30 -0500 Subject: [PATCH] drm/amd/display: Release AUX engine after failed acquire [Why] There is a sequence in which aux arbitration doesn't work correctly. Driver is left with aux access after it times out waiting for access. In future dmub fw is never granted aux access and is stuck in a while loop. [How] Cancel aux request from driver after timing out. Reviewed-by: Aric Cyr Acked-by: Alan Liu Signed-off-by: Wyatt Wood Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c index 74b05b3aef08..b8d6f4202413 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c @@ -413,7 +413,7 @@ static bool acquire( return false; if (!acquire_engine(engine)) { - dal_ddc_close(ddc); + release_engine(engine); return false; } -- 2.11.0