[v2] drm/amdgpu: fix scheduler timeout calc

Submitted by Cui, Flora on June 25, 2019, 9:43 a.m.

Details

Message ID 1561455804-9644-1-git-send-email-flora.cui@amd.com
State New
Headers show
Series "drm/amdgpu: fix scheduler timeout calc" ( rev: 2 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Cui, Flora June 25, 2019, 9:43 a.m.
scheduler timeout is in jiffies
v2: move timeout check to amdgpu_device_get_job_timeout_settings after
parsing the value & add negative value check

Change-Id: I26708c163db943ff8d930dd81bcab4b4b9d84eb2
Signed-off-by: Flora Cui <flora.cui@amd.com>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.7.4

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 7cf6ab0..7206d0d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1300,7 +1300,7 @@  int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
 	 * By default timeout for non compute jobs is 10000.
 	 * And there is no timeout enforced on compute jobs.
 	 */
-	adev->gfx_timeout = adev->sdma_timeout = adev->video_timeout = 10000;
+	adev->gfx_timeout = adev->sdma_timeout = adev->video_timeout = msecs_to_jiffies(10000);
 	adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
 
 	if (strnlen(input, AMDGPU_MAX_TIMEOUT_PARAM_LENTH)) {
@@ -1314,6 +1314,10 @@  int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
 			if (timeout <= 0) {
 				index++;
 				continue;
+			} else if ((long)msecs_to_jiffies(timeout) < 0) {
+				timeout = MAX_SCHEDULE_TIMEOUT;
+			} else {
+				timeout = msecs_to_jiffies(timeout);
 			}
 
 			switch (index++) {