drm/amd/display: Fix up dm logging functionality (66dec27a) · Commits · 戴 / test

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -330,11 +330,6 @@ bool dm_helpers_dp_mst_send_payload_allocation(
		return true;
		}

		bool dm_helpers_dc_conn_log(struct dc_context ctx, struct log_entry entry, enum dc_log_type event)
		{
		return true;
		}

		void dm_dtn_log_begin(struct dc_context *ctx)
		{}

drivers/gpu/drm/amd/display/dc/basics/log_helpers.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ void dc_conn_log(struct dc_context *ctx,
		dm_logger_append(&entry, "%2.2X ", hex_data[i]);

		dm_logger_append(&entry, "^\n");
		dm_helpers_dc_conn_log(ctx, &entry, event);

		fail:
		dm_logger_close(&entry);

drivers/gpu/drm/amd/display/dc/basics/logger.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -402,3 +402,4 @@ cleanup:
		entry->max_buf_bytes = 0;
		}
		}

drivers/gpu/drm/amd/display/dc/dm_services.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -355,10 +355,6 @@ void dm_perf_trace_timestamp(const char *func_name, unsigned int line);
		/*
		* Debug and verification hooks
		*/
		bool dm_helpers_dc_conn_log(
		struct dc_context *ctx,
		struct log_entry *entry,
		enum dc_log_type event);

		void dm_dtn_log_begin(struct dc_context *ctx);
		void dm_dtn_log_append_v(struct dc_context ctx, const char msg, ...);

drivers/gpu/drm/amd/display/modules/stats/stats.c

+16 −8

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ void mod_stats_dump(struct mod_stats *mod_stats)
		struct core_stats *core_stats = NULL;
		struct stats_time_cache *time = NULL;
		unsigned int index = 0;
		struct log_entry log_entry;

		if (mod_stats == NULL)
		return;
		@@ -177,17 +178,22 @@ void mod_stats_dump(struct mod_stats *mod_stats)
		logger = dc->ctx->logger;
		time = core_stats->time;

		dm_logger_write(logger, LOG_DISPLAYSTATS, "==Display Caps==");
		dm_logger_write(logger, LOG_DISPLAYSTATS, " ");
		dm_logger_open(
		dc->ctx->logger,
		&log_entry,
		LOG_DISPLAYSTATS);

		dm_logger_write(logger, LOG_DISPLAYSTATS, "==Display Stats==");
		dm_logger_write(logger, LOG_DISPLAYSTATS, " ");
		dm_logger_append(&log_entry, "==Display Caps==\n");
		dm_logger_append(&log_entry, "\n");

		dm_logger_write(logger, LOG_DISPLAYSTATS,
		dm_logger_append(&log_entry, "==Display Stats==\n");
		dm_logger_append(&log_entry, "\n");

		dm_logger_append(&log_entry,
		"%10s %10s %10s %10s %10s"
		" %11s %11s %17s %10s %14s"
		" %10s %10s %10s %10s %10s"
		" %10s %10s %10s %10s",
		" %10s %10s %10s %10s\n",
		"render", "avgRender",
		"minWindow", "midPoint", "maxWindow",
		"vsyncToFlip", "flipToVsync", "vsyncsBetweenFlip",
		@@ -197,11 +203,11 @@ void mod_stats_dump(struct mod_stats *mod_stats)
		"vSyncTime4", "vSyncTime5", "flags");

		for (int i = 0; i < core_stats->index && i < core_stats->entries; i++) {
		dm_logger_write(logger, LOG_DISPLAYSTATS,
		dm_logger_append(&log_entry,
		"%10u %10u %10u %10u %10u"
		" %11u %11u %17u %10u %14u"
		" %10u %10u %10u %10u %10u"
		" %10u %10u %10u %10u",
		" %10u %10u %10u %10u\n",
		time[i].render_time_in_us,
		time[i].avg_render_time_in_us_last_ten,
		time[i].min_window,
		@@ -222,6 +228,8 @@ void mod_stats_dump(struct mod_stats *mod_stats)
		time[i].v_sync_time_in_us[4],
		time[i].flags);
		}

		dm_logger_close(&log_entry);
		}

		void mod_stats_reset_data(struct mod_stats *mod_stats)

Admin message