Commit 44444574 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amdgpu: add condition check for trace_amdgpu_cs() 



v1:
add trace event enabled check to avoid nop loop when submit multi ibs
in amdgpu_cs_ioctl() function.

v2:
add a new wrapper function to trace all amdgpu cs ibs.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 736b1729

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+13 −3
Original line number Diff line number Diff line
@@ -1275,13 +1275,24 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	return r;

}



static void trace_amdgpu_cs_ibs(struct amdgpu_cs_parser *parser)

{

	int i;



	if (!trace_amdgpu_cs_enabled())

		return;



	for (i = 0; i < parser->job->num_ibs; i++)

		trace_amdgpu_cs(parser, i);

}



int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)

{

	struct amdgpu_device *adev = dev->dev_private;

	union drm_amdgpu_cs *cs = data;

	struct amdgpu_cs_parser parser = {};

	bool reserved_buffers = false;

	int i, r;

	int r;



	if (amdgpu_ras_intr_triggered())

		return -EHWPOISON;
@@ -1319,8 +1330,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 


	reserved_buffers = true;



	for (i = 0; i < parser.job->num_ibs; i++)

		trace_amdgpu_cs(&parser, i);

	trace_amdgpu_cs_ibs(&parser);



	r = amdgpu_cs_vm_handling(&parser);

	if (r)