From: Greg Kroah-Hartman Date: Sun, 1 May 2016 22:59:23 +0000 (-0700) Subject: 4.4-stable patches X-Git-Tag: v3.14.68~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee2ea18d67b8f5332d5f79e5832759c68c14a61d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: drm-amdgpu-fix-regression-on-cik-v2.patch --- diff --git a/queue-4.4/drm-amdgpu-fix-regression-on-cik-v2.patch b/queue-4.4/drm-amdgpu-fix-regression-on-cik-v2.patch new file mode 100644 index 00000000000..c48ac4da156 --- /dev/null +++ b/queue-4.4/drm-amdgpu-fix-regression-on-cik-v2.patch @@ -0,0 +1,36 @@ +From alexdeucher@gmail.com Sun May 1 15:58:01 2016 +From: Grigori Goronzy +Date: Tue, 22 Mar 2016 15:48:18 -0400 +Subject: drm/amdgpu: fix regression on CIK (v2) +To: gregkh@linuxfoundation.org +Cc: christian.koenig@amd.com, greg@chown.ath.cx, stable@vger.kernel.org, Alex Deucher +Message-ID: <1458676098-9543-1-git-send-email-alexander.deucher@amd.com> + +From: Grigori Goronzy + +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 +Cc: stable@vger.kernel.org +Signed-off-by: Alex Deucher + +--- + 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)); diff --git a/queue-4.4/series b/queue-4.4/series index 754ea31dbad..9e224c3c36f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -66,3 +66,4 @@ drm-amdgpu-when-suspending-if-uvd-vce-was-running.-need-to-cancel-delay-work.pat drm-amdgpu-use-defines-for-crtcs-and-amft-blocks.patch drm-amdgpu-bump-the-afmt-limit-for-cz-st-polaris.patch amdgpu-uvd-add-uvd-fw-version-for-amdgpu.patch +drm-amdgpu-fix-regression-on-cik-v2.patch