On Thu, 26 Mar 2015, Daniel Vetter <daniel@xxxxxxxx> wrote: > On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie <airlied@xxxxxxxxx> wrote: >> I've pushed a drm-fixes-staging branch that backport's Daniel's >> drm-next fix from 9 hours ago, >> >> However it isn't tested yet, so if you want to give it a whirl grab it. >> >> Hopefully when Daniel comes on line he can provide assurance that my >> fix is a correct backport. > > Your missing the backport of > > 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 > > My manual backport is here > > http://www.mail-archive.com/linux-kernel@xxxxxxxxxxxxxxx/msg854137.html > > The backport of the other patch you have in -staging looks fine. The drm-intel-fixes pull request I just sent [1] covers both of these. It's on top of drm-fixes, i.e. superseeds -staging. BR, Jani. [1] http://mid.gmane.org/87egocrmyc.fsf@xxxxxxxxx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel