From: Daniel Vetter <daniel@ffwll.ch>
To: "Michel Dänzer" <michel@daenzer.net>, "Dave Airlie" <airlied@gmail.com>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>,
Dave Airlie <airlied@gmail.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
Date: Wed, 25 Jan 2017 13:54:32 +0100 [thread overview]
Message-ID: <20170125125432.h4s2apszk3nphxok@phenom.ffwll.local> (raw)
In-Reply-To: <d52e1626-46ce-7845-07d8-fb14d44af8ef@daenzer.net>
On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> >> ----------------------------------------------------------------
> >> Alex Deucher (8):
> >> drm/radeon/si: load special ucode for certain MC configs
> >> drm/amdgpu/si: load special ucode for certain MC configs
> >> drm/amdgpu: drop oland quirks
> >> drm/amdgpu: drop the mclk quirk for hainan
> >> drm/radeon: drop oland quirks
> >> drm/radeon: drop the mclk quirk for hainan
> >> drm/radeon: add support for new hainan variants
> >> drm/amdgpu: add support for new hainan variants
> >
> > Since the merge I get the following warning during boot:
>
> [...]
>
> > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
>
> This is likely due to
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
>
> Daniel, please take a look.
Yup, I butchered this badly. The patch is correct, it also references the
right commits and if those commits would all be in 4.10 it would even
work. But the connector_list locking rework is only in drm-next, which
means it's totally not working :(
Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
then when you backmerge -fixes into -next make sure git doesn't drop it on
the floor? Or maybe for safety do it the other way round:
- first revert on drm-fixes
- then backmerge
- then reapply to drm-next.
Sorry for this mess ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2017-01-25 12:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-22 23:38 Dave Airlie
2017-01-23 8:13 ` Daniel Vetter
2017-01-25 8:33 ` Markus Trippelsdorf
2017-01-25 9:10 ` Michel Dänzer
2017-01-25 12:54 ` Daniel Vetter [this message]
2017-01-26 4:33 ` Lukas Wunner
2017-01-26 9:42 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170125125432.h4s2apszk3nphxok@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=michel@daenzer.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®