OSDN Git Service

drm/amd/display: Add ETW log to dmub_psr_get_state
authorWyatt Wood <wyatt.wood@amd.com>
Mon, 12 Jul 2021 16:30:50 +0000 (12:30 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 27 Jul 2021 16:10:50 +0000 (12:10 -0400)
[Why]
GPINT commands have the lowest priority in DMCUB, so it's possible
that the command isn't processed in time.

[How]
Add a log to help identify this case.

Reviewed-by: Koo Anthony <Anthony.Koo@amd.com>
Acked-by: Solomon Chiu <solomon.chiu@amd.com>
Signed-off-by: Wyatt Wood <wyatt.wood@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c

index 3428334..1ca8b1d 100644 (file)
@@ -29,6 +29,8 @@
 #include "dmub/dmub_srv.h"
 #include "core_types.h"
 
+#define DC_TRACE_LEVEL_MESSAGE(...) /* do nothing */
+
 #define MAX_PIPES 6
 
 /*
@@ -96,10 +98,19 @@ static void dmub_psr_get_state(struct dmub_psr *dmub, enum dc_psr_state *state,
                        // Return invalid state when GPINT times out
                        *state = PSR_STATE_INVALID;
 
-               // Assert if max retry hit
-               if (retry_count >= 1000)
-                       ASSERT(0);
        } while (++retry_count <= 1000 && *state == PSR_STATE_INVALID);
+
+       // Assert if max retry hit
+       if (retry_count >= 1000 && *state == PSR_STATE_INVALID) {
+               ASSERT(0);
+               DC_TRACE_LEVEL_MESSAGE(DAL_TRACE_LEVEL_ERROR,
+                               WPP_BIT_FLAG_Firmware_PsrState,
+                               "Unable to get PSR state from FW.");
+       } else
+               DC_TRACE_LEVEL_MESSAGE(DAL_TRACE_LEVEL_VERBOSE,
+                               WPP_BIT_FLAG_Firmware_PsrState,
+                               "Got PSR state from FW. PSR state: %d, Retry count: %d",
+                               *state, retry_count);
 }
 
 /*