Commit 1f61fc28 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/mes: make more vmids available when disable_kq=1 



If we don't have kernel queues, the vmids can be used by
the MES for user queues.

Acked-by: default avatarPrike Liang <Prike.Liang@amd.com>
Reviewed-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent acdc43f2

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

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int amdgpu_mes_init(struct amdgpu_device *adev) 


	adev->mes.total_max_queue = AMDGPU_FENCE_MES_QUEUE_ID_MASK;

	adev->mes.vmid_mask_mmhub = 0xffffff00;

	adev->mes.vmid_mask_gfxhub = 0xffffff00;

	adev->mes.vmid_mask_gfxhub = adev->gfx.disable_kq ? 0xfffffffe : 0xffffff00;



	num_pipes = adev->gfx.me.num_pipe_per_me * adev->gfx.me.num_me;

	if (num_pipes > AMDGPU_MES_MAX_GFX_PIPES)

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

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static int gmc_v10_0_sw_init(struct amdgpu_ip_block *ip_block) 
	 * amdgpu graphics/compute will use VMIDs 1-7

	 * amdkfd will use VMIDs 8-15

	 */

	adev->vm_manager.first_kfd_vmid = 8;

	adev->vm_manager.first_kfd_vmid = adev->gfx.disable_kq ? 1 : 8;



	amdgpu_vm_manager_init(adev);

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

+1 −1
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ static int gmc_v12_0_sw_init(struct amdgpu_ip_block *ip_block) 
	 * amdgpu graphics/compute will use VMIDs 1-7

	 * amdkfd will use VMIDs 8-15

	 */

	adev->vm_manager.first_kfd_vmid = 8;

	adev->vm_manager.first_kfd_vmid = adev->gfx.disable_kq ? 1 : 8;



	amdgpu_vm_manager_init(adev);