<div dir="auto"><div><br><div class="gmail_extra"><br><div class="gmail_quote">On 26 Jan. 2017 19:42, "Daniel Vetter" <<a href="mailto:daniel@ffwll.ch">daniel@ffwll.ch</a>> wrote:<br type="attribution"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="elided-text">On Thu, Jan 26, 2017 at 05:33:57AM +0100, Lukas Wunner wrote:<br>
> On Wed, Jan 25, 2017 at 01:54:32PM +0100, Daniel Vetter wrote:<br>
> > On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:<br>
> > > On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:<br>
> > > > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:<br>
> > > >> ------------------------------<wbr>------------------------------<wbr>----<br>
> > > >> Alex Deucher (8):<br>
> > > >> drm/radeon/si: load special ucode for certain MC configs<br>
> > > >> drm/amdgpu/si: load special ucode for certain MC configs<br>
> > > >> drm/amdgpu: drop oland quirks<br>
> > > >> drm/amdgpu: drop the mclk quirk for hainan<br>
> > > >> drm/radeon: drop oland quirks<br>
> > > >> drm/radeon: drop the mclk quirk for hainan<br>
> > > >> drm/radeon: add support for new hainan variants<br>
> > > >> drm/amdgpu: add support for new hainan variants<br>
> > > ><br>
> > > > Since the merge I get the following warning during boot:<br>
> > ><br>
> > > [...]<br>
> > ><br>
> > > > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+<wbr>0x127/0x140<br>
> > ><br>
> > > This is likely due to<br>
> > > <a href="https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42" rel="noreferrer" target="_blank">https://git.kernel.org/cgit/<wbr>linux/kernel/git/torvalds/<wbr>linux.git/commit/?id=<wbr>3846fd9b86001bea171943cc3bb922<wbr>2cb6da6b42</a><br>
> > ><br>
> > > Daniel, please take a look.<br>
> ><br>
> > Yup, I butchered this badly. The patch is correct, it also references the<br>
> > right commits and if those commits would all be in 4.10 it would even<br>
> > work. But the connector_list locking rework is only in drm-next, which<br>
> > means it's totally not working :(<br>
> ><br>
> > Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and<br>
> > then when you backmerge -fixes into -next make sure git doesn't drop it on<br>
> > the floor? Or maybe for safety do it the other way round:<br>
> > - first revert on drm-fixes<br>
> > - then backmerge<br>
> > - then reapply to drm-next.<br>
><br>
> It's not sufficient to only fix this in drm-next. Without 3846fd9b8600,<br>
> certain Optimus laptops won't (runtime) resume:<br>
> <a href="https://bugzilla.kernel.org/show_bug.cgi?id=190861" rel="noreferrer" target="_blank">https://bugzilla.kernel.org/<wbr>show_bug.cgi?id=190861</a><br>
><br>
> Bjorn Helgaas therefore had queued up a revert for PCIe port runtime PM<br>
> and only dequeued it once 3846fd9b8600 landed in Linus' tree.<br>
><br>
> Please re-submit 3846fd9b8600 and its prerequisites for drm-fixes at<br>
> your earliest convenience.<br>
<br>
</div>That's way, way too much depencies for 4.10, the connector_locking rework<br>
is by far not simple. We'll do this properly in 4.11, and for 4.10 the<br>
most we'll be a quick hack to make nouveau happy (which we'll revert for<br>
4.11 again). This probably means we need to delay the pci change until<br>
4.11 too :(<br></blockquote></div></div></div><div dir="auto"><br></div><div dir="auto">I think Lyude's nouveau changes should be enough to avoid the problem completely, they aren't incorrect either just not as optimal.</div><div dir="auto"><br></div><div dir="auto">I'll line things up tomorrow.</div><div dir="auto"><br></div><div dir="auto">Dave.</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_extra"><div class="gmail_quote"><blockquote class="quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="elided-text">-Daniel<br>
--<br>
Daniel Vetter<br>
Software Engineer, Intel Corporation<br>
<a href="http://blog.ffwll.ch" rel="noreferrer" target="_blank">http://blog.ffwll.ch</a><br>
</div></blockquote></div><br></div></div></div>