Messages in this thread | | | From | Jani Nikula <> | Subject | Re: [git pull] drm urgent fix | Date | Thu, 26 Mar 2015 14:13:51 +0200 |
| |
On Thu, 26 Mar 2015, Daniel Vetter <daniel@ffwll.ch> wrote: > On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie <airlied@gmail.com> 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@intel.com> > 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@vger.kernel.org/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@intel.com
-- Jani Nikula, Intel Open Source Technology Center
| |