mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: Prike Liang <Prike.Liang@amd.com> Reviewed-by: Sunil Khatri <sunil.khatri@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
		
							parent
							
								
									acdc43f270
								
							
						
					
					
						commit
						1f61fc28b9
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
					@ -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.total_max_queue = AMDGPU_FENCE_MES_QUEUE_ID_MASK;
 | 
				
			||||||
	adev->mes.vmid_mask_mmhub = 0xffffff00;
 | 
						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;
 | 
						num_pipes = adev->gfx.me.num_pipe_per_me * adev->gfx.me.num_me;
 | 
				
			||||||
	if (num_pipes > AMDGPU_MES_MAX_GFX_PIPES)
 | 
						if (num_pipes > AMDGPU_MES_MAX_GFX_PIPES)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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
 | 
						 * amdgpu graphics/compute will use VMIDs 1-7
 | 
				
			||||||
	 * amdkfd will use VMIDs 8-15
 | 
						 * 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);
 | 
						amdgpu_vm_manager_init(adev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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
 | 
						 * amdgpu graphics/compute will use VMIDs 1-7
 | 
				
			||||||
	 * amdkfd will use VMIDs 8-15
 | 
						 * 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);
 | 
						amdgpu_vm_manager_init(adev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue