Commit d7dab4fc authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: save the setting of VM_CONTEXT_CNTL 



MES firmware needs the setting of VM_CONTEXT_CNTL to perform
vmid switch. Save the initial setting when hub initializing.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 98a0f868

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct amdgpu_vmhub { 
	uint32_t	eng_distance;

	uint32_t	eng_addr_distance; /* include LO32/HI32 */



	uint32_t        vm_cntx_cntl;

	uint32_t	vm_cntx_cntl_vm_fault;

	uint32_t	vm_l2_bank_select_reserved_cid2;

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

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ static void gfxhub_v2_0_setup_vmid_config(struct amdgpu_device *adev) 
				    i * hub->ctx_addr_distance,

				    upper_32_bits(adev->vm_manager.max_pfn - 1));

	}



	hub->vm_cntx_cntl = tmp;

}



static void gfxhub_v2_0_program_invalidation(struct amdgpu_device *adev)

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

+2 −0
Original line number Diff line number Diff line
@@ -334,6 +334,8 @@ static void gfxhub_v2_1_setup_vmid_config(struct amdgpu_device *adev) 
				    i * hub->ctx_addr_distance,

				    upper_32_bits(adev->vm_manager.max_pfn - 1));

	}



	hub->vm_cntx_cntl = tmp;

}



static void gfxhub_v2_1_program_invalidation(struct amdgpu_device *adev)

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

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ static void gfxhub_v3_0_setup_vmid_config(struct amdgpu_device *adev) 
				    i * hub->ctx_addr_distance,

				    upper_32_bits(adev->vm_manager.max_pfn - 1));

	}



	hub->vm_cntx_cntl = tmp;

}



static void gfxhub_v3_0_program_invalidation(struct amdgpu_device *adev)

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

+2 −0
Original line number Diff line number Diff line
@@ -408,6 +408,8 @@ static void mmhub_v2_0_setup_vmid_config(struct amdgpu_device *adev) 
				    i * hub->ctx_addr_distance,

				    upper_32_bits(adev->vm_manager.max_pfn - 1));

	}



	hub->vm_cntx_cntl = tmp;

}



static void mmhub_v2_0_program_invalidation(struct amdgpu_device *adev)