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

Commit 4241db42 authored by Jordan Crouse's avatar Jordan Crouse Committed by Rob Clark
Browse files

drm/msm/gpu: Add trace events for tracking GPU submissions 



Add trace events to track the progress of a GPU submission
msm_gpu_submit occurs at the beginning of the submissions,
msm_gpu_submit_flush happens when the submission is put on
the ringbuffer and msm_submit_flush_retired is sent when
the operation is retired.

To make it easier to track the operations a unique sequence
number is assigned to each submission and displayed in each
event output so a human or a script can easily associate
the events related to a specific submission.

Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 56869210

drivers/gpu/drm/msm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ msm-y := \ 
	msm_perf.o \

	msm_rd.o \

	msm_ringbuffer.o \

	msm_submitqueue.o

	msm_submitqueue.o \

	msm_gpu_tracepoints.o



msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o \

			  disp/dpu1/dpu_dbg.o

drivers/gpu/drm/msm/adreno/a6xx_gpu.c

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


#include "msm_gem.h"

#include "msm_mmu.h"

#include "msm_gpu_trace.h"

#include "a6xx_gpu.h"

#include "a6xx_gmu.xml.h"
@@ -81,6 +82,8 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
{

	unsigned int index = submit->seqno % MSM_GPU_SUBMIT_STATS_COUNT;

	struct msm_drm_private *priv = gpu->dev->dev_private;

	struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu);

	struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu);

	struct msm_ringbuffer *ring = submit->ring;

	unsigned int i;
@@ -138,6 +141,10 @@ static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, 
	OUT_RING(ring, upper_32_bits(rbmemptr(ring, fence)));

	OUT_RING(ring, submit->seqno);



	trace_msm_gpu_submit_flush(submit,

		gmu_read64(&a6xx_gpu->gmu, REG_A6XX_GMU_ALWAYS_ON_COUNTER_L,

			REG_A6XX_GMU_ALWAYS_ON_COUNTER_H));



	a6xx_flush(gpu, ring);

}

drivers/gpu/drm/msm/msm_gem.h

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ struct msm_gem_submit { 
	struct msm_ringbuffer *ring;

	unsigned int nr_cmds;

	unsigned int nr_bos;

	u32 ident;	   /* A "identifier" for the submit for logging */

	struct {

		uint32_t type;

		uint32_t size;  /* in dwords */

drivers/gpu/drm/msm/msm_gem_submit.c

+12 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "msm_drv.h"

#include "msm_gpu.h"

#include "msm_gem.h"

#include "msm_gpu_trace.h"



/*

 * Cmdstream submission:
@@ -48,7 +49,6 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev, 
	submit->dev = dev;

	submit->gpu = gpu;

	submit->fence = NULL;

	submit->pid = get_pid(task_pid(current));

	submit->cmd = (void *)&submit->bos[nr_bos];

	submit->queue = queue;

	submit->ring = gpu->rb[queue->prio];
@@ -406,6 +406,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) 
int msm_ioctl_gem_submit(struct drm_device *dev, void *data,

		struct drm_file *file)

{

	static atomic_t ident = ATOMIC_INIT(0);

	struct msm_drm_private *priv = dev->dev_private;

	struct drm_msm_gem_submit *args = data;

	struct msm_file_private *ctx = file->driver_priv;
@@ -416,9 +417,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	struct msm_gpu_submitqueue *queue;

	struct msm_ringbuffer *ring;

	int out_fence_fd = -1;

	struct pid *pid = get_pid(task_pid(current));

	unsigned i;

	int ret;



	int ret, submitid;

	if (!gpu)

		return -ENXIO;
@@ -441,7 +442,12 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	if (!queue)

		return -ENOENT;



	/* Get a unique identifier for the submission for logging purposes */

	submitid = atomic_inc_return(&ident) - 1;



	ring = gpu->rb[queue->prio];

	trace_msm_gpu_submit(pid_nr(pid), ring->id, submitid,

		args->nr_bos, args->nr_cmds);



	if (args->flags & MSM_SUBMIT_FENCE_FD_IN) {

		in_fence = sync_file_get_fence(args->fence_fd);
@@ -478,6 +484,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
		goto out_unlock;

	}



	submit->pid = pid;

	submit->ident = submitid;



	if (args->flags & MSM_SUBMIT_SUDO)

		submit->in_rb = true;

drivers/gpu/drm/msm/msm_gpu.c

+21 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "msm_gem.h"

#include "msm_mmu.h"

#include "msm_fence.h"

#include "msm_gpu_trace.h"



#include <generated/utsrelease.h>

#include <linux/string_helpers.h>
@@ -659,10 +660,28 @@ int msm_gpu_perfcntr_sample(struct msm_gpu *gpu, uint32_t *activetime, 
 * Cmdstream submission/retirement:

 */



static void retire_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit)

static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,

		struct msm_gem_submit *submit)

{

	int index = submit->seqno % MSM_GPU_SUBMIT_STATS_COUNT;

	volatile struct msm_gpu_submit_stats *stats;

	u64 elapsed, clock = 0;

	int i;



	stats = &ring->memptrs->stats[index];

	/* Convert 19.2Mhz alwayson ticks to nanoseconds for elapsed time */

	elapsed = (stats->alwayson_end - stats->alwayson_start) * 10000;

	do_div(elapsed, 192);



	/* Calculate the clock frequency from the number of CP cycles */

	if (elapsed) {

		clock = (stats->cpcycles_end - stats->cpcycles_start) * 1000;

		do_div(clock, elapsed);

	}



	trace_msm_gpu_submit_retired(submit, elapsed, clock,

		stats->alwayson_start, stats->alwayson_end);



	for (i = 0; i < submit->nr_bos; i++) {

		struct msm_gem_object *msm_obj = submit->bos[i].obj;

		/* move to inactive: */
@@ -690,7 +709,7 @@ static void retire_submits(struct msm_gpu *gpu) 


		list_for_each_entry_safe(submit, tmp, &ring->submits, node) {

			if (dma_fence_is_signaled(submit->fence))

				retire_submit(gpu, submit);

				retire_submit(gpu, ring, submit);

		}

	}

}