drm/amdgpu: prevent spurious warning

alexdeucher · alexdeucher · commit 9142c4131a70 · 2020-10-09T15:14:10.000-04:00
The default auto setting for kcq should not generate a warning. Fixes: a300de4 ("drm/amdgpu: introduce a new parameter to configure how many KCQ we want(v5)") Reviewed-by: Kent Russell <kent.russell@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1370,7 +1370,9 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev)
 
 	amdgpu_gmc_tmz_set(adev);
 
-	if (amdgpu_num_kcq > 8 || amdgpu_num_kcq < 0) {
+	if (amdgpu_num_kcq == -1) {
+		amdgpu_num_kcq = 8;
+	} else if (amdgpu_num_kcq > 8 || amdgpu_num_kcq < 0) {
 		amdgpu_num_kcq = 8;
 		dev_warn(adev->dev, "set kernel compute queue number to 8 due to invalid parameter provided by user\n");
 	}

Original file line number	Diff line number	Diff line change
`@@ -1370,7 +1370,9 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev)`
`1370`	`1370`
`1371`	`1371`	`amdgpu_gmc_tmz_set(adev);`
`1372`	`1372`
`1373`		`- if (amdgpu_num_kcq > 8 \|\| amdgpu_num_kcq < 0) {`
	`1373`	`+ if (amdgpu_num_kcq == -1) {`
	`1374`	`+ amdgpu_num_kcq = 8;`
	`1375`	`+ } else if (amdgpu_num_kcq > 8 \|\| amdgpu_num_kcq < 0) {`
`1374`	`1376`	`amdgpu_num_kcq = 8;`
`1375`	`1377`	`dev_warn(adev->dev, "set kernel compute queue number to 8 due to invalid parameter provided by user\n");`
`1376`	`1378`	`}`