Hi all,
After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c: In function 'amdgpu_job_timedout':
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:90:33: error: too many arguments to function 'drm_sched_start'
90 | drm_sched_start(&ring->sched, true);
| ^~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h:28,
from drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h:29,
from drivers/gpu/drm/amd/amdgpu/amdgpu.h:43,
from drivers/gpu/drm/amd/amdgpu/amdgpu_job.c:30:
include/drm/gpu_scheduler.h:582:6: note: declared here
582 | void drm_sched_start(struct drm_gpu_scheduler *sched);
| ^~~~~~~~~~~~~~~
Caused by commit
15789fa0f0e2 ("drm/amdgpu: add per ring reset support (v5)")
interacting with commit
83b501c1799a ("drm/scheduler: remove full_recover from drm_sched_start")
from the drm tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 19 Aug 2024 11:46:24 +1000
Subject: [PATCH] fixup for "drm/amdgpu: add per ring reset support (v5)"
interacting with "drm/scheduler: remove full_recover from drm_sched_start"
from the drm tree.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index c6a1783fc9ef..597489dea114 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -87,7 +87,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job)
atomic_inc(&ring->adev->gpu_reset_counter);
amdgpu_fence_driver_force_completion(ring);
if (amdgpu_ring_sched_ready(ring))
- drm_sched_start(&ring->sched, true);
+ drm_sched_start(&ring->sched);
goto exit;
}
}
--
2.43.0
--
Cheers,
Stephen Rothwell
Attachment:
pgp4qv2N47_7q.pgp
Description: OpenPGP digital signature
