Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d3c950 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: add rd logging debugfs 



To ease debugging, add debugfs file which can be cat/tail'd to log
submits, along with fence #.  If GPU hangs, you can look at 'gpu'
debugfs file to find last completed fence and current register state,
and compare with logged rd file to narrow down the DRAW_INDX which
triggered the GPU hang.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent fb27b8f2

drivers/gpu/drm/msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ msm-y := \ 
	msm_gem_submit.o \

	msm_gpu.o \

	msm_iommu.o \

	msm_rd.o \

	msm_ringbuffer.o



msm-$(CONFIG_DRM_MSM_FBDEV) += msm_fbdev.o

drivers/gpu/drm/msm/msm_drv.c

+37 −1
Original line number Diff line number Diff line
@@ -299,6 +299,10 @@ static int msm_load(struct drm_device *dev, unsigned long flags) 
	priv->fbdev = msm_fbdev_init(dev);

#endif



	ret = msm_debugfs_late_init(dev);

	if (ret)

		goto fail;



	drm_kms_helper_poll_init(dev);



	return 0;
@@ -531,6 +535,35 @@ static struct drm_info_list msm_debugfs_list[] = { 
		{ "fb", show_locked, 0, msm_fb_show },

};



static int late_init_minor(struct drm_minor *minor)

{

	int ret;



	if (!minor)

		return 0;



	ret = msm_rd_debugfs_init(minor);

	if (ret) {

		dev_err(minor->dev->dev, "could not install rd debugfs\n");

		return ret;

	}



	return 0;

}



int msm_debugfs_late_init(struct drm_device *dev)

{

	int ret;

	ret = late_init_minor(dev->primary);

	if (ret)

		return ret;

	ret = late_init_minor(dev->render);

	if (ret)

		return ret;

	ret = late_init_minor(dev->control);

	return ret;

}



static int msm_debugfs_init(struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;
@@ -545,13 +578,16 @@ static int msm_debugfs_init(struct drm_minor *minor) 
		return ret;

	}



	return ret;

	return 0;

}



static void msm_debugfs_cleanup(struct drm_minor *minor)

{

	drm_debugfs_remove_files(msm_debugfs_list,

			ARRAY_SIZE(msm_debugfs_list), minor);

	if (!minor->dev->dev_private)

		return;

	msm_rd_debugfs_cleanup(minor);

}

#endif

drivers/gpu/drm/msm/msm_drv.h

+11 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static inline struct device *msm_iommu_get_ctx(const char *ctx_name) 
struct msm_kms;

struct msm_gpu;

struct msm_mmu;

struct msm_rd_state;

struct msm_gem_submit;



#define NUM_DOMAINS 2    /* one for KMS, then one per gpu core (?) */
@@ -82,6 +84,8 @@ struct msm_drm_private { 
	uint32_t next_fence, completed_fence;

	wait_queue_head_t fence_event;



	struct msm_rd_state *rd;



	/* list of GEM objects: */

	struct list_head inactive_list;
@@ -204,6 +208,13 @@ void __exit hdmi_unregister(void); 
void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m);

void msm_gem_describe_objects(struct list_head *list, struct seq_file *m);

void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m);

int msm_debugfs_late_init(struct drm_device *dev);

int msm_rd_debugfs_init(struct drm_minor *minor);

void msm_rd_debugfs_cleanup(struct drm_minor *minor);

void msm_rd_dump_submit(struct msm_gem_submit *submit);

#else

static inline int msm_debugfs_late_init(struct drm_device *dev) { return 0; }

static inline void msm_rd_dump_submit(struct msm_gem_submit *submit) {}

#endif



void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,

drivers/gpu/drm/msm/msm_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct msm_gem_submit { 
		uint32_t type;

		uint32_t size;  /* in dwords */

		uint32_t iova;

		uint32_t idx;   /* cmdstream buffer idx in bos[] */

	} cmd[MAX_CMDS];

	struct {

		uint32_t flags;

drivers/gpu/drm/msm/msm_gem_submit.c

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
		submit->cmd[i].type = submit_cmd.type;

		submit->cmd[i].size = submit_cmd.size / 4;

		submit->cmd[i].iova = iova + submit_cmd.submit_offset;

		submit->cmd[i].idx  = submit_cmd.submit_idx;



		if (submit->valid)

			continue;