That change was squashed into the following patches along with the fix for UVD as well: https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961 https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb The amd-staging-4.7 branch is a mirror of our internal tree: https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-4.7 I don't think I've missed any patches. There are minor changes due to squashing some fixes into the original patches for upstream. If you are still getting failures with drm-next-4.9(-wip) or amd-staging-4.7, please file a bug and attach your dmesg output. Alex From: Ernst Sjöstrand [mailto:ernstp@xxxxxxxxx] Sent: Friday, October 14, 2016 10:23 AM To: Deucher, Alexander Cc: amd-gfx mailing list; StDenis, Tom Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 2016-10-14 16:12 GMT+02:00 Deucher, Alexander <Alexander.Deucher at amd.com<mailto:Alexander.Deucher at amd.com>>: What patch are you referring to? Alex From: Ernst Sjöstrand [mailto:ernstp@xxxxxxxxx<mailto:ernstp at gmail.com>] Sent: Friday, October 14, 2016 10:06 AM To: Deucher, Alexander Cc: amd-gfx mailing list; StDenis, Tom Subject: RE: [PATCH] amdgpu: Fix failing boot after support for third vce ring next-4.9 and wip are the broken branches for me so something is wrong. I could cherry pick the patch Tom mentioned and got a delta so I don't think you have it. Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" <Alexander.Deucher at amd.com<mailto:Alexander.Deucher at amd.com>>: All of those patches are integrated: https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961 From: amd-gfx [mailto:amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx<mailto:amd-gfx-bounces at lists.freedesktop.org>] On Behalf Of StDenis, Tom Sent: Friday, October 14, 2016 9:21 AM To: Ernst Sjöstrand Cc: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring You'd need https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13 and https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3 I'll let Alex speak for the drm-next branches since he manages them. Tom ________________________________ From: Ernst Sjöstrand <ernstp@xxxxxxxxx<mailto:ernstp at gmail.com>> Sent: Friday, October 14, 2016 09:20 To: StDenis, Tom Cc: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring Means the drm pull request for 4.9 is broken then also, FYI. 2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <ernstp at gmail.com<mailto:ernstp at gmail.com>>: 9d24b304abbe5380da1bc782b4460596e7cb1109 cherry-picks cleanly on drm-next-4.9-wip but then fails to build: CC [M] drivers/gpu/drm/amd/amdgpu/vce_v3_0.o drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:2: error: unknown field â??typeâ?? specified in initializer .type = AMDGPU_RING_TYPE_VCE, ^ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion] .type = AMDGPU_RING_TYPE_VCE, ^ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:854:10: note: (near initialization for â??vce_v3_0_ring_phys_funcs.get_rptrâ??) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:2: error: unknown field â??align_maskâ?? specified in initializer .align_mask = 0xf, ^ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion] .align_mask = 0xf, ^ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:855:16: note: (near initialization for â??vce_v3_0_ring_phys_funcs.get_wptrâ??) drivers/gpu/drm/amd/amdgpu/vce_v3_0.c:856:2: error: unknown field â??nopâ?? specified in initializer .nop = VCE_CMD_NO_OP, ^ 2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <ernstp at gmail.com<mailto:ernstp at gmail.com>>: I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f. I think the problem is in drm-next now also. They all have 6f0359f drm/amdgpu/vce3: add support for third vce ring 75c6548 drm/amdgpu: track the number of vce rings But not 9d24b30 drm/amdgpu: fix broken VCE startup in phys mode which only exists in amd-staging-4.7 (What does 4.7 mean in this context... ?) Regards //Ernst 2016-10-14 15:07 GMT+02:00 StDenis, Tom <Tom.StDenis at amd.com<mailto:Tom.StDenis at amd.com>>: Do you have https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109 as well? I've booted the tip of our staging-4.7 branch with a FIJI device (FURY) and was able to play videos (vdpau) and normal GL apps. Tom ________________________________ From: Ernst Sjöstrand <ernstp@xxxxxxxxx<mailto:ernstp at gmail.com>> Sent: Friday, October 14, 2016 09:05 To: StDenis, Tom Cc: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> Subject: Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring Yes, the 6f0359ff73076483902de0c17f9649bf55651e2a I'm referring to is the same as 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 (only exists in amd-staging). So the last of those two commits is the one that causes my problem. Regards //Ernst 2016-10-14 14:53 GMT+02:00 StDenis, Tom <Tom.StDenis at amd.com<mailto:Tom.StDenis at amd.com>>: Does your tree have 2f3d686d0ee95332d8888169c7b6788bb2d9f5ad 780605db12c52f2c22d4d2cc05ceb7d2a9d55579 in it? Those are fixes for when the third ring were added. Tom ________________________________ From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx<mailto:amd-gfx-bounces at lists.freedesktop.org>> on behalf of Ernst Sjöstrand <ernstp at gmail.com<mailto:ernstp at gmail.com>> Sent: Friday, October 14, 2016 08:49 To: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> Cc: Ernst Sjöstrand Subject: [PATCH] amdgpu: Fix failing boot after support for third vce ring My Fiji class Fury fails to boot after commit 6f0359ff73076483902de0c17f9649bf55651e2a "drm/amdgpu/vce3: add support for third vce ring" This commits reverts the number of vce rings back to 2, but leaves the other changes intact. Signed-off-by: Ernst Sjöstrand <ernstp at gmail.com<mailto:ernstp at gmail.com>> --- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c index 3f899e3..6f5eb64 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c @@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle) (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1)) return -ENOENT; - adev->vce.num_rings = 3; + adev->vce.num_rings = 2; vce_v3_0_set_ring_funcs(adev); vce_v3_0_set_irq_funcs(adev); -- 2.7.4 _______________________________________________ amd-gfx mailing list amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org> https://lists.freedesktop.org/mailman/listinfo/amd-gfx amd-gfx Info Page - lists.freedesktop.org<https://lists.freedesktop.org/mailman/listinfo/amd-gfx> lists.freedesktop.org<http://lists.freedesktop.org> To see the collection of prior postings to the list, visit the amd-gfx Archives. Using amd-gfx: To post a message to all the list members, send email ... -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20161014/37ecd097/attachment-0001.html>
