Re: [Intel-gfx] [git pull] drm fixes

From: Josh Boyer
Date: Wed Mar 25 2015 - 09:11:26 EST


On Wed, Mar 25, 2015 at 4:54 AM, Daniel Vetter <daniel@xxxxxxxx> wrote:
>> >> commit f55548b5af87ebfc586ca75748947f1c1b1a4a52
>> >> Author: Damien Lespiau <damien.lespiau@xxxxxxxxx>
>> >> Date: Thu Feb 5 18:30:20 2015 +0000
>> >>
>> >> drm/i915: Don't try to reference the fb in get_initial_plane_config()
>> >>
>> >> From linux-next?
>> >
>> > Yes, building now. Will let you know as soon as I test it on both machines.
>>
>> OK, with that commit applied I no longer get the kref.h splat and the
>> NUC machine boots headless. I still see the backtrace below on both
>> the NUC and the macbook. I have a copy of it with drm.debug=0xff from
>> the NUC here:
>>
>> https://jwboyer.fedorapeople.org/pub/nuc-drm-debug-ff-with-fixes.txt
>>
>> Getting better at least :).
>
> On top of what you currently have please also cherry-pick
>
> commit fb9981aa675eb7b398849915364916fd98833cfa
> Author: Damien Lespiau <damien.lespiau@xxxxxxxxx>
> Date: Thu Feb 5 19:24:25 2015 +0000
>
> drm/i915: Fix atomic state when reusing the firmware fb
>
> from -next. Let's hope this terminates eventually ;-)

Hm. That one doesn't apply cleanly. I think because it needs: