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

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

drm/amdgpu: if a GDS switch is needed emit a pipeline sync as well 



Otherwise we might change the GDS settings while they are still in use.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
parent b8c7b39e

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

+12 −10
Original line number Diff line number Diff line
@@ -254,22 +254,24 @@ void amdgpu_vm_flush(struct amdgpu_ring *ring, 
{

	struct amdgpu_device *adev = ring->adev;

	struct amdgpu_vm_manager_id *mgr_id = &adev->vm_manager.ids[vm_id];



	if (pd_addr != AMDGPU_VM_NO_FLUSH) {

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

		if (ring->funcs->emit_pipeline_sync)

			amdgpu_ring_emit_pipeline_sync(ring);

		amdgpu_ring_emit_vm_flush(ring, vm_id, pd_addr);

	}



	if (ring->funcs->emit_gds_switch && (

	bool gds_switch_needed = ring->funcs->emit_gds_switch && (

		mgr_id->gds_base != gds_base ||

		mgr_id->gds_size != gds_size ||

		mgr_id->gws_base != gws_base ||

		mgr_id->gws_size != gws_size ||

		mgr_id->oa_base != oa_base ||

	    mgr_id->oa_size != oa_size)) {

		mgr_id->oa_size != oa_size);



	if (ring->funcs->emit_pipeline_sync && (

	    pd_addr != AMDGPU_VM_NO_FLUSH || gds_switch_needed))

		amdgpu_ring_emit_pipeline_sync(ring);



	if (pd_addr != AMDGPU_VM_NO_FLUSH) {

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

		amdgpu_ring_emit_vm_flush(ring, vm_id, pd_addr);

	}



	if (gds_switch_needed) {

		mgr_id->gds_base = gds_base;

		mgr_id->gds_size = gds_size;

		mgr_id->gws_base = gws_base;