This is a note to let you know that I've just added the patch titled
drm/amdgpu: fix regression on CIK (v2)
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-fix-regression-on-cik-v2.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From alexdeucher@xxxxxxxxx Sun May 1 15:58:01 2016
From: Grigori Goronzy <greg@xxxxxxxxxxxx>
Date: Tue, 22 Mar 2016 15:48:18 -0400
Subject: drm/amdgpu: fix regression on CIK (v2)
To: gregkh@xxxxxxxxxxxxxxxxxxx
Cc: christian.koenig@xxxxxxx, greg@xxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Alex Deucher <alexander.deucher@xxxxxxx>
Message-ID: <1458676098-9543-1-git-send-email-alexander.deucher@xxxxxxx>
From: Grigori Goronzy <greg@xxxxxxxxxxxx>
This fix was written against drm-next, but when it was
backported to 4.5 as a stable fix, the driver internal
structure change was missed. Fix that up here to avoid
a hang due to waiting for the wrong sequence number.
v2: agd: fix up commit message
Signed-off-by: Grigori Goronzy <greg@xxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -3628,7 +3628,7 @@ static void gfx_v7_0_ring_emit_vm_flush(
unsigned vm_id, uint64_t pd_addr)
{
int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX);
- uint32_t seq = ring->fence_drv.sync_seq;
+ uint32_t seq = ring->fence_drv.sync_seq[ring->idx];
uint64_t addr = ring->fence_drv.gpu_addr;
amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5));
Patches currently in stable-queue which might be from greg@xxxxxxxxxxxx are
queue-4.4/drm-amdgpu-fix-regression-on-cik-v2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html