Hi Greg,
Due to backporting 2320c9e of to 6.1.120, 6.6.66 and 6.12.5 kernel series we have the following bug report: https://gitlab.freedesktop.org/drm/amd/-/issues/3831
The commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f should be backported to 6.1, 6.6 and 6.12 stable branches.
On 12/15/2024 10:37, Philip Müller wrote:
Hi Greg,
Due to backporting 2320c9e of to 6.1.120, 6.6.66 and 6.12.5 kernel series we have the following bug report: https://gitlab.freedesktop.org/ drm/amd/-/issues/3831
The commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f should be backported to 6.1, 6.6 and 6.12 stable branches.
Add regressions list to keep track of this.
Add Sasha for awareness. It looks like this is a case that autosel picked the commit, but the "fix" hasn't been picked for it.
Either the original commit should revert or the fix should pick up too.
On 24/12/16 08:13AM, Mario Limonciello wrote:
On 12/15/2024 10:37, Philip Müller wrote:
Hi Greg,
Due to backporting 2320c9e of to 6.1.120, 6.6.66 and 6.12.5 kernel series we have the following bug report: https://gitlab.freedesktop.org/ drm/amd/-/issues/3831
The commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f should be backported to 6.1, 6.6 and 6.12 stable branches.
Add regressions list to keep track of this.
Add Sasha for awareness. It looks like this is a case that autosel picked the commit, but the "fix" hasn't been picked for it.
Either the original commit should revert or the fix should pick up too.
ignore the three backport proposals that were sent as an answer to the initial report, it seems like sasha has already picked these up without me noticing!
Cheers, Chris
From: "David (Ming Qiang) Wu" David.Wu3@amd.com
base.sched may not be set for each instance and should not be used for cases such as non-IB tests.
Fixes: 2320c9e6a768 ("drm/sched: memset() 'job' in drm_sched_job_init()") Signed-off-by: David (Ming Qiang) Wu David.Wu3@amd.com Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f) --- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index 6068b784dc69..9a30b8c10838 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c @@ -1289,7 +1289,7 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p, struct amdgpu_job *job, struct amdgpu_ib *ib) { - struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched); + struct amdgpu_ring *ring = amdgpu_job_ring(job); unsigned i;
/* No patching necessary for the first instance */ -- 2.47.1
From: "David (Ming Qiang) Wu" David.Wu3@amd.com
base.sched may not be set for each instance and should not be used for cases such as non-IB tests.
Fixes: 2320c9e6a768 ("drm/sched: memset() 'job' in drm_sched_job_init()") Signed-off-by: David (Ming Qiang) Wu David.Wu3@amd.com Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f) Signed-off-by: Christian Heusel christian@heusel.eu --- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index 86d1d46e1e5e..4fba0b3d10f1 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c @@ -1286,7 +1286,7 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p, struct amdgpu_job *job, struct amdgpu_ib *ib) { - struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched); + struct amdgpu_ring *ring = amdgpu_job_ring(job); unsigned i;
/* No patching necessary for the first instance */ -- 2.47.1
From: "David (Ming Qiang) Wu" David.Wu3@amd.com
base.sched may not be set for each instance and should not be used for cases such as non-IB tests.
Fixes: 2320c9e6a768 ("drm/sched: memset() 'job' in drm_sched_job_init()") Signed-off-by: David (Ming Qiang) Wu David.Wu3@amd.com Reviewed-by: Christian König christian.koenig@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com (cherry picked from commit 47f402a3e08113e0f5d8e1e6fcc197667a16022f) Signed-off-by: Christian Heusel christian@heusel.eu --- drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c index e668b3baa8c60..1c5d79528ca75 100644 --- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c @@ -1284,7 +1284,7 @@ static int uvd_v7_0_ring_patch_cs_in_place(struct amdgpu_cs_parser *p, struct amdgpu_job *job, struct amdgpu_ib *ib) { - struct amdgpu_ring *ring = to_amdgpu_ring(job->base.sched); + struct amdgpu_ring *ring = amdgpu_job_ring(job); unsigned i;
/* No patching necessary for the first instance */ -- 2.47.1
linux-stable-mirror@lists.linaro.org