Commit 5d5bd5e3 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amdgpu: restrict the hw sched jobs number to power of two 



the module parameter sched_hw_submission is probably from user mode,
and the kernel need to check whether it is legal.

1. align hw sched jobs to power of 2 and set minimum number is 2.
2. use kernel api is_power_of_2() to simplify driver code.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2217b249

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

+10 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,16 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev) 
		amdgpu_vm_fragment_size = -1;

	}



	if (amdgpu_sched_hw_submission < 2) {

		dev_warn(adev->dev, "sched hw submission jobs (%d) must be at least 2\n",

			 amdgpu_sched_hw_submission);

		amdgpu_sched_hw_submission = 2;

	} else if (!is_power_of_2(amdgpu_sched_hw_submission)) {

		dev_warn(adev->dev, "sched hw submission jobs (%d) must be a power of 2\n",

			 amdgpu_sched_hw_submission);

		amdgpu_sched_hw_submission = roundup_pow_of_two(amdgpu_sched_hw_submission);

	}



	amdgpu_device_check_smu_prv_buffer_size(adev);



	amdgpu_device_check_vm_size(adev);

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

+1 −2
Original line number Diff line number Diff line
@@ -450,8 +450,7 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, 
	if (!adev)

		return -EINVAL;



	/* Check that num_hw_submission is a power of two */

	if ((num_hw_submission & (num_hw_submission - 1)) != 0)

	if (!is_power_of_2(num_hw_submission))

		return -EINVAL;



	ring->fence_drv.cpu_addr = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE