leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/display: Make DisplayStats work with just DC DisplayStats minor

Browse Source 
Remove dependency on the old FREESYNC_SW_STATS log mask used by DAL2
Also rename from profiling to displaystats

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Anthony Koo
2018-04-19 10:05:22 -04:00
committed by Alex Deucher
parent f3ba7a2fd1
commit e8838df1cb
3 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/basics/logger.c
View File

@@ -61,7 +61,7 @@ static const struct dc_log_type_info log_type_info_tbl[] = {
{LOG_EVENT_UNDERFLOW, "Underflow"}, {LOG_EVENT_UNDERFLOW, "Underflow"},
{LOG_IF_TRACE, "InterfaceTrace"}, {LOG_IF_TRACE, "InterfaceTrace"},
{LOG_DTN, "DTN"}, {LOG_DTN, "DTN"},
{LOG_PROFILING, "Profiling"} {LOG_DISPLAYSTATS, "DisplayStats"}
}; };

2
drivers/gpu/drm/amd/display/include/logger_types.h
View File

@@ -98,7 +98,7 @@ enum dc_log_type {
LOG_EVENT_UNDERFLOW, LOG_EVENT_UNDERFLOW,
LOG_IF_TRACE, LOG_IF_TRACE,
LOG_PERF_TRACE, LOG_PERF_TRACE,
LOG_PROFILING, LOG_DISPLAYSTATS,
LOG_SECTION_TOTAL_COUNT LOG_SECTION_TOTAL_COUNT
}; };

35
drivers/gpu/drm/amd/display/modules/stats/stats.c
View File

@@ -177,21 +177,31 @@ void mod_stats_dump(struct mod_stats *mod_stats)
logger = dc->ctx->logger; logger = dc->ctx->logger;
time = core_stats->time; time = core_stats->time;
//LogEntry* pLog = GetLog()->Open(LogMajor_ISR, LogMinor_ISR_FreeSyncSW); dm_logger_write(logger, LOG_DISPLAYSTATS, "==Display Caps==");
dm_logger_write(logger, LOG_DISPLAYSTATS, " ");
//if (!pLog->IsDummyEntry()) dm_logger_write(logger, LOG_DISPLAYSTATS, "==Display Stats==");
{ dm_logger_write(logger, LOG_DISPLAYSTATS, " ");
dm_logger_write(logger, LOG_PROFILING, "==Display Caps==\n");
dm_logger_write(logger, LOG_PROFILING, "\n");
dm_logger_write(logger, LOG_PROFILING, "\n");
dm_logger_write(logger, LOG_PROFILING, "==Stats==\n"); dm_logger_write(logger, LOG_DISPLAYSTATS,
dm_logger_write(logger, LOG_PROFILING, "%10s %10s %10s %10s %10s"
"render avgRender minWindow midPoint maxWindow vsyncToFlip flipToVsync #vsyncBetweenFlip #frame insertDuration vTotalMin vTotalMax eventTrigs vSyncTime1 vSyncTime2 vSyncTime3 vSyncTime4 vSyncTime5 flags\n"); " %11s %11s %17s %10s %14s"
" %10s %10s %10s %10s %10s"
" %10s %10s %10s %10s",
"render", "avgRender",
"minWindow", "midPoint", "maxWindow",
"vsyncToFlip", "flipToVsync", "vsyncsBetweenFlip",
"numFrame", "insertDuration",
"vTotalMin", "vTotalMax", "eventTrigs",
"vSyncTime1", "vSyncTime2", "vSyncTime3",
"vSyncTime4", "vSyncTime5", "flags");
for (int i = 0; i < core_stats->index && i < core_stats->entries; i++) { for (int i = 0; i < core_stats->index && i < core_stats->entries; i++) {
dm_logger_write(logger, LOG_PROFILING, dm_logger_write(logger, LOG_DISPLAYSTATS,
"%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", "%10u %10u %10u %10u %10u"
" %11u %11u %17u %10u %14u"
" %10u %10u %10u %10u %10u"
" %10u %10u %10u %10u",
time[i].render_time_in_us, time[i].render_time_in_us,
time[i].avg_render_time_in_us_last_ten, time[i].avg_render_time_in_us_last_ten,
time[i].min_window, time[i].min_window,
@@ -213,9 +223,6 @@ void mod_stats_dump(struct mod_stats *mod_stats)
time[i].flags); time[i].flags);
} }
} }
//GetLog()->Close(pLog);
//GetLog()->UnSetLogMask(LogMajor_ISR, LogMinor_ISR_FreeSyncSW);
}
void mod_stats_reset_data(struct mod_stats *mod_stats) void mod_stats_reset_data(struct mod_stats *mod_stats)
{ {