<p dir="ltr">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. </p>
<div class="gmail_extra"><br><div class="gmail_quote">Den 14 okt. 2016 3:49 em skrev "Deucher, Alexander" <<a href="mailto:Alexander.Deucher@amd.com">Alexander.Deucher@amd.com</a>>:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">





<div lang="EN-US" link="blue" vlink="purple">
<div class="m_2020318726477089758WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">All of those patches are integrated:<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><a href="https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=57da26e4c4c1c7cc042aba1925813fea7413dbeb" target="_blank">https://cgit.freedesktop.org/~<wbr>agd5f/linux/commit/?h=drm-<wbr>next-4.9-wip&id=<wbr>57da26e4c4c1c7cc042aba1925813f<wbr>ea7413dbeb</a><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><a href="https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.9-wip&id=d7ca7ab8259f43473bc387dda2a5b84aeb049961" target="_blank">https://cgit.freedesktop.org/~<wbr>agd5f/linux/commit/?h=drm-<wbr>next-4.9-wip&id=<wbr>d7ca7ab8259f43473bc387dda2a5b8<wbr>4aeb049961</a><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #b5c4df 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> amd-gfx [mailto:<a href="mailto:amd-gfx-bounces@lists.freedesktop.org" target="_blank">amd-gfx-bounces@lists.<wbr>freedesktop.org</a>]
<b>On Behalf Of </b>StDenis, Tom<br>
<b>Sent:</b> Friday, October 14, 2016 9:21 AM<br>
<b>To:</b> Ernst Sjöstrand<br>
<b>Cc:</b> <a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<b>Subject:</b> Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring<u></u><u></u></span></p>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421m_-1771598304858325824LPMetadata_14764495470460.18698958466014992">
<p><span style="font-family:"Calibri","sans-serif";color:black">You'd need <u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><a href="https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9ab4662c313d25731e53cc4f044bddb9c506ca13" id="m_2020318726477089758LPlnk511980" target="_blank">https://cgit.freedesktop.org/~<wbr>agd5f/linux/commit/?h=drm-<wbr>next-4.7-wip&id=<wbr>9ab4662c313d25731e53cc4f044bdd<wbr>b9c506ca13</a><u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">and<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><a href="https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=da00756f75422b04befae381e7e48d0cacf299f3" id="m_2020318726477089758LPlnk276724" target="_blank">https://cgit.freedesktop.org/~<wbr>agd5f/linux/commit/?h=drm-<wbr>next-4.7-wip&id=<wbr>da00756f75422b04befae381e7e48d<wbr>0cacf299f3</a><u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">I'll let Alex speak for the drm-next branches since he manages them.<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">Tom<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<div class="MsoNormal" align="center" style="text-align:center"><span style="font-family:"Calibri","sans-serif";color:black">
<hr size="2" width="98%" align="center">
</span></div>
<div id="m_2020318726477089758divRplyFwdMsg">
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black"> Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>><br>
<b>Sent:</b> Friday, October 14, 2016 09:20<br>
<b>To:</b> StDenis, Tom<br>
<b>Cc:</b> <a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<b>Subject:</b> Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring</span><span style="font-family:"Calibri","sans-serif";color:black">
<u></u><u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"> <u></u><u></u></span></p>
</div>
</div>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">Means the drm pull request for 4.9 is broken then also, FYI.<u></u><u></u></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">2016-10-14 15:17 GMT+02:00 Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>>:<u></u><u></u></span></p>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">9d24b304abbe5380da1bc782b44605<wbr>96e7cb1109<u></u><u></u></span></p>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black">cherry-picks cleanly on drm-next-4.9-wip but then fails to build:<br>
<br>
  CC [M]  drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.o<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:854:2: error: unknown field ‘type’ specified in initializer<br>
  .type = AMDGPU_RING_TYPE_VCE,<br>
  ^<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:854:10: warning: initialization makes pointer from integer without a cast [-Wint-conversion]<br>
  .type = AMDGPU_RING_TYPE_VCE,<br>
          ^<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:854:10: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_<wbr>rptr’)<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:855:2: error: unknown field ‘align_mask’ specified in initializer<br>
  .align_mask = 0xf,<br>
  ^<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:855:16: warning: initialization makes pointer from integer without a cast [-Wint-conversion]<br>
  .align_mask = 0xf,<br>
                ^<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:855:16: note: (near initialization for ‘vce_v3_0_ring_phys_funcs.get_<wbr>wptr’)<br>
drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c:856:2: error: unknown field ‘nop’ specified in initializer<br>
  .nop = VCE_CMD_NO_OP,<br>
  ^<u></u><u></u></span></p>
</div>
<div>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">2016-10-14 15:15 GMT+02:00 Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>>:<u></u><u></u></span></p>
<div>
<div>
<div>
<div>
<div>
<div>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">I'm testing both drm-next-4.9 and drm-next-4.9-wip from ~agd5f.<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">I think the problem is in drm-next now also.<u></u><u></u></span></p>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black">They all have<br>
6f0359f drm/amdgpu/vce3: add support for third vce ring<br>
75c6548 drm/amdgpu: track the number of vce rings<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">But not<br>
9d24b30 drm/amdgpu: fix broken VCE startup in phys mode<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">which only exists in amd-staging-4.7<u></u><u></u></span></p>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black">(What does 4.7 mean in this context... ?)<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">Regards<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span class="m_2020318726477089758m-2167022505463390063hoenzb"><span style="font-family:"Calibri","sans-serif";color:#888888">//Ernst</span><span style="color:#888888"><u></u><u></u></span></span></p>
<div>
<div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
</div>
</div>
<div>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">2016-10-14 15:07 GMT+02:00 StDenis, Tom <<a href="mailto:Tom.StDenis@amd.com" target="_blank">Tom.StDenis@amd.com</a>>:<u></u><u></u></span></p>
<div>
<div>
<p><span style="font-family:"Calibri","sans-serif";color:black">Do you have <a href="https://cgit.freedesktop.org/~agd5f/linux/commit/?h=drm-next-4.7-wip&id=9d24b304abbe5380da1bc782b4460596e7cb1109" id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421LPlnk640528" target="_blank">https://cgit.freedesktop.<wbr>org/~agd5f/linux/commit/?h=<wbr>drm-next-4.7-wip&id=<wbr>9d24b304abbe5380da1bc782b44605<wbr>96e7cb1109</a> as
 well?<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">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.<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">Tom<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<div class="MsoNormal" align="center" style="text-align:center"><span style="font-family:"Calibri","sans-serif";color:black">
<hr size="2" width="98%" align="center">
</span></div>
<div id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421divRplyFwdMsg">
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black"> Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>><br>
<b>Sent:</b> Friday, October 14, 2016 09:05<br>
<b>To:</b> StDenis, Tom<br>
<b>Cc:</b> <a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<b>Subject:</b> Re: [PATCH] amdgpu: Fix failing boot after support for third vce ring</span><span style="font-family:"Calibri","sans-serif";color:black">
<u></u><u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"> <u></u><u></u></span></p>
</div>
</div>
<div>
<div>
<div>
<div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">Yes, the  6f0359ff73076483902de0c17f9649<wbr>bf55651e2a I'm referring to is the same as
<br>
780605db12c52f2c22d4d2cc05ceb7<wbr>d2a9d55579 (only exists in amd-staging).<u></u><u></u></span></p>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">So the last of those two commits is the one that causes my problem.<u></u><u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">Regards<u></u><u></u></span></p>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">//Ernst<u></u><u></u></span></p>
</div>
</div>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black">2016-10-14 14:53 GMT+02:00 StDenis, Tom <<a href="mailto:Tom.StDenis@amd.com" target="_blank">Tom.StDenis@amd.com</a>>:<u></u><u></u></span></p>
<div>
<div>
<p><span style="font-family:"Calibri","sans-serif";color:black">Does your tree have <u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">2f3d686d0ee95332d8888169c7b678<wbr>8bb2d9f5ad<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">780605db12c52f2c22d4d2cc05ceb7<wbr>d2a9d55579<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">in it?  Those are fixes for when the third ring were added.<u></u><u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<p><span style="font-family:"Calibri","sans-serif";color:black">Tom<u></u><u></u></span></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
<div>
<div>
<div class="MsoNormal" align="center" style="text-align:center"><span style="font-family:"Calibri","sans-serif";color:black">
<hr size="2" width="98%" align="center">
</span></div>
<div id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421m_-1771598304858325824x_divRplyFwdMsg">
<p class="MsoNormal"><b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black">From:</span></b><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:black"> amd-gfx <<a href="mailto:amd-gfx-bounces@lists.freedesktop.org" target="_blank">amd-gfx-bounces@lists.<wbr>freedesktop.org</a>>
 on behalf of Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>><br>
<b>Sent:</b> Friday, October 14, 2016 08:49<br>
<b>To:</b> <a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<b>Cc:</b> Ernst Sjöstrand<br>
<b>Subject:</b> [PATCH] amdgpu: Fix failing boot after support for third vce ring</span><span style="font-family:"Calibri","sans-serif";color:black">
<u></u><u></u></span></p>
<div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"> <u></u><u></u></span></p>
</div>
</div>
</div>
<div>
<div>
<div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-size:10.0pt;font-family:"Calibri","sans-serif";color:black">My Fiji class Fury fails to boot after commit<br>
6f0359ff73076483902de0c17f9649<wbr>bf55651e2a<br>
"drm/amdgpu/vce3: add support for third vce ring"<br>
This commits reverts the number of vce rings back to 2,<br>
but leaves the other changes intact.<br>
<br>
Signed-off-by: Ernst Sjöstrand <<a href="mailto:ernstp@gmail.com" target="_blank">ernstp@gmail.com</a>><br>
---<br>
 drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c | 2 +-<br>
 1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c<br>
index 3f899e3..6f5eb64 100644<br>
--- a/drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c<br>
+++ b/drivers/gpu/drm/amd/amdgpu/<wbr>vce_v3_0.c<br>
@@ -358,7 +358,7 @@ static int vce_v3_0_early_init(void *handle)<br>
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))<br>
                 return -ENOENT;<br>
 <br>
-       adev->vce.num_rings = 3;<br>
+       adev->vce.num_rings = 2;<br>
 <br>
         vce_v3_0_set_ring_funcs(adev);<br>
         vce_v3_0_set_irq_funcs(adev);<br>
-- <br>
2.7.4<u></u><u></u></span></p>
</div>
</div>
<p class="MsoNormal"><span style="font-size:10.0pt;font-family:"Calibri","sans-serif";color:black">______________________________<wbr>_________________<br>
amd-gfx mailing list<br>
<a href="mailto:amd-gfx@lists.freedesktop.org" target="_blank">amd-gfx@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421m_-1771598304858325824LPlnk959250" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/amd-gfx</a>
<u></u><u></u></span></p>
<div style="margin-bottom:15.0pt">
<table class="m_2020318726477089758MsoNormalTable" border="1" cellspacing="0" cellpadding="0" width="90%" style="width:90.0%;background:white;border-top:dotted #c8c8c8 1.0pt;border-left:none;border-bottom:dotted #c8c8c8 1.0pt;border-right:none">
<tbody>
<tr>
<td valign="top" style="border:none;padding:0in 0in 0in 0in">
<div>
<p class="MsoNormal" style="margin-top:15.0pt"><span style="font-size:16.0pt;font-family:"Segoe UI Light","sans-serif";color:#3b5777"><a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" target="_blank"><span style="text-decoration:none">amd-gfx
 Info Page - lists.freedesktop.org</span></a><u></u><u></u></span></p>
</div>
<div style="margin-top:7.5pt;margin-bottom:12.0pt" id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421m_-1771598304858325824LPMetadata_14764495470460.18698958466014992">
<p class="MsoNormal" style="margin-top:15.0pt;line-height:10.5pt"><span style="font-size:10.5pt;font-family:"Segoe UI","sans-serif";color:#666666"><a href="http://lists.freedesktop.org" target="_blank">lists.freedesktop.org</a><u></u><u></u></span></p>
</div>
<div id="m_2020318726477089758m_-2167022505463390063m_7545045248063895902m_-8133334703298494421m_-1771598304858325824LPDescription_14764495470460.6448197846508978">
<p class="MsoNormal" style="margin-top:15.0pt;line-height:15.0pt"><span style="font-size:10.5pt;font-family:"Segoe UI","sans-serif";color:#666666">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 ...<u></u><u></u></span></p>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-size:10.0pt;font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
</div>
</div>
</div>
<p class="MsoNormal"><span style="font-family:"Calibri","sans-serif";color:black"><u></u> <u></u></span></p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

</blockquote></div></div>