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

Commit 2f3e1f38 authored by Tushar Patel's avatar Tushar Patel Committed by Greg Kroah-Hartman
Browse files

drm/amdkfd: Fix Incorrect VMIDs passed to HWS 



[ Upstream commit b7dfbd2e601f3fee545bc158feceba4f340fe7cf ]

Compute-only GPUs have more than 8 VMIDs allocated to KFD. Fix
this by passing correct number of VMIDs to HWS

v2: squash in warning fix (Alex)

Signed-off-by: default avatarTushar Patel <tushar.patel@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 46ca8233

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

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ MODULE_PARM_DESC(sched_policy, 
 * Maximum number of processes that HWS can schedule concurrently. The maximum is the

 * number of VMIDs assigned to the HWS, which is also the default.

 */

int hws_max_conc_proc = 8;

int hws_max_conc_proc = -1;

module_param(hws_max_conc_proc, int, 0444);

MODULE_PARM_DESC(hws_max_conc_proc,

	"Max # processes HWS can execute concurrently when sched_policy=0 (0 = no concurrency, #VMIDs for KFD = Maximum(default))");

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+3 −8
Original line number Diff line number Diff line
@@ -609,15 +609,10 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
			- kfd->vm_info.first_vmid_kfd + 1;



	/* Verify module parameters regarding mapped process number*/

	if ((hws_max_conc_proc < 0)

			|| (hws_max_conc_proc > kfd->vm_info.vmid_num_kfd)) {

		dev_err(kfd_device,

			"hws_max_conc_proc %d must be between 0 and %d, use %d instead\n",

			hws_max_conc_proc, kfd->vm_info.vmid_num_kfd,

			kfd->vm_info.vmid_num_kfd);

	if (hws_max_conc_proc >= 0)

		kfd->max_proc_per_quantum = min((u32)hws_max_conc_proc, kfd->vm_info.vmid_num_kfd);

	else

		kfd->max_proc_per_quantum = kfd->vm_info.vmid_num_kfd;

	} else

		kfd->max_proc_per_quantum = hws_max_conc_proc;



	/* Allocate global GWS that is shared by all KFD processes */

	if (hws_gws_support && amdgpu_amdkfd_alloc_gws(kfd->kgd,