drm/amd/display: Spin for DMCUB PHY init in DC

[Why]
DCN will hang if we access registers before PHY init is done.

So we need to spin or abort.

[How]
On hardware with DMCUB running and working we shouldn't time out
waiting for this to finish and we shouldn't hit the spin cycle.

If there's no hardware support then we should exit out of the function
early assuming that PHY init was already done elsewhere.

If we hit the timeout then there's likely a bug in firmware or software
and we need to debug - add errors and asserts as appropriate.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
index 8d348a5f5599c9b8f81c2449b561e4bc51fc0502..59c298a6484f396c3872dcb9d6ca32b6baa12a32 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
@@ -112,10 +112,23 @@ void dc_dmub_srv_wait_phy_init(struct dc_dmub_srv *dc_dmub_srv)
        struct dc_context *dc_ctx = dc_dmub_srv->ctx;
        enum dmub_status status;
 
-       status = dmub_srv_wait_for_phy_init(dmub, 10000000);
-       if (status != DMUB_STATUS_OK) {
-               DC_ERROR("Error waiting for DMUB phy init: status=%d\n",
-                        status);
+       for (;;) {
+               /* Wait up to a second for PHY init. */
+               status = dmub_srv_wait_for_phy_init(dmub, 1000000);
+               if (status == DMUB_STATUS_OK)
+                       /* Initialization OK */
+                       break;
+
+               DC_ERROR("DMCUB PHY init failed: status=%d\n", status);
                ASSERT(0);
+
+               if (status != DMUB_STATUS_TIMEOUT)
+                       /*
+                        * Server likely initialized or we don't have
+                        * DMCUB HW support - this won't end.
+                        */
+                       break;
+
+               /* Continue spinning so we don't hang the ASIC. */
        }
 }