Commit 857548cb authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/disp: Tweak display snapshot to match gpu snapshot 



Add UTS_RELEASE and show timestamp the same way for consistency.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20211215174524.1742389-2-robdclark@gmail.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 8ecfef96

drivers/gpu/drm/msm/disp/msm_disp_snapshot.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
 * @dev: device pointer

 * @drm_dev: drm device pointer

 * @atomic_state: atomic state duplicated at the time of the error

 * @timestamp: timestamp at which the coredump was captured

 * @time: timestamp at which the coredump was captured

 */

struct msm_disp_state {

	struct device *dev;
@@ -49,7 +49,7 @@ struct msm_disp_state { 


	struct drm_atomic_state *atomic_state;



	ktime_t timestamp;

	struct timespec64 time;

};



/**

drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c

+6 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__



#include <generated/utsrelease.h>



#include "msm_disp_snapshot.h"



static void msm_disp_state_dump_regs(u32 **reg, u32 aligned_len, void __iomem *base_addr)
@@ -79,10 +81,11 @@ void msm_disp_state_print(struct msm_disp_state *state, struct drm_printer *p) 
	}



	drm_printf(p, "---\n");



	drm_printf(p, "kernel: " UTS_RELEASE "\n");

	drm_printf(p, "module: " KBUILD_MODNAME "\n");

	drm_printf(p, "dpu devcoredump\n");

	drm_printf(p, "timestamp %lld\n", ktime_to_ns(state->timestamp));

	drm_printf(p, "time: %lld.%09ld\n",

		state->time.tv_sec, state->time.tv_nsec);



	list_for_each_entry_safe(block, tmp, &state->blocks, node) {

		drm_printf(p, "====================%s================\n", block->name);
@@ -100,7 +103,7 @@ static void msm_disp_capture_atomic_state(struct msm_disp_state *disp_state) 
	struct drm_device *ddev;

	struct drm_modeset_acquire_ctx ctx;



	disp_state->timestamp = ktime_get();

	ktime_get_real_ts64(&disp_state->time);



	ddev = disp_state->drm_dev;