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

Commit c0e51931 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup coding style in amdgpu_vm_flush 



Abort early if there is nothing todo and correctly indent the "if"s.

Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 641e9400

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

+45 −43
Original line number Diff line number Diff line
@@ -597,12 +597,14 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) 
		id->gws_size != job->gws_size ||

		id->oa_base != job->oa_base ||

		id->oa_size != job->oa_size);

	unsigned patch_offset = 0;

	int r;



	if (job->vm_needs_flush || gds_switch_needed ||

		amdgpu_vm_had_gpu_reset(adev, id) ||

		amdgpu_vm_ring_has_compute_vm_bug(ring)) {

		unsigned patch_offset = 0;

	if (!job->vm_needs_flush && !gds_switch_needed &&

	    !amdgpu_vm_had_gpu_reset(adev, id) &&

	    !amdgpu_vm_ring_has_compute_vm_bug(ring))

		return 0;





	if (ring->funcs->init_cond_exec)

		patch_offset = amdgpu_ring_init_cond_exec(ring);
@@ -612,10 +614,11 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) 
	     amdgpu_vm_ring_has_compute_vm_bug(ring)))

		amdgpu_ring_emit_pipeline_sync(ring);



		if (ring->funcs->emit_vm_flush && (job->vm_needs_flush ||

			amdgpu_vm_had_gpu_reset(adev, id))) {

			struct dma_fence *fence;

	if (ring->funcs->emit_vm_flush &&

	    (job->vm_needs_flush || amdgpu_vm_had_gpu_reset(adev, id))) {



		u64 pd_addr = amdgpu_vm_adjust_mc_addr(adev, job->vm_pd_addr);

		struct dma_fence *fence;



		trace_amdgpu_vm_flush(pd_addr, ring->idx, job->vm_id);

		amdgpu_ring_emit_vm_flush(ring, job->vm_id, pd_addr);
@@ -637,10 +640,10 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) 
		id->gws_size = job->gws_size;

		id->oa_base = job->oa_base;

		id->oa_size = job->oa_size;

			amdgpu_ring_emit_gds_switch(ring, job->vm_id,

							job->gds_base, job->gds_size,

							job->gws_base, job->gws_size,

							job->oa_base, job->oa_size);

		amdgpu_ring_emit_gds_switch(ring, job->vm_id, job->gds_base,

					    job->gds_size, job->gws_base,

					    job->gws_size, job->oa_base,

					    job->oa_size);

	}



	if (ring->funcs->patch_cond_exec)
@@ -651,7 +654,6 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job) 
		amdgpu_ring_emit_switch_buffer(ring);

		amdgpu_ring_emit_switch_buffer(ring);

	}

	}

	return 0;

}