From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [git pull] drm urgent fix Date: Thu, 26 Mar 2015 14:13:51 +0200 Message-ID: <871tkcrm68.fsf@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 420996E9E8 for ; Thu, 26 Mar 2015 05:15:00 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Dave Airlie Cc: Linus Torvalds , Linux Kernel Mailing List , DRI mailing list List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAyNiBNYXIgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBUaHUsIE1hciAyNiwgMjAxNSBhdCA0OjI5IEFNLCBEYXZlIEFpcmxpZSA8YWlybGll ZEBnbWFpbC5jb20+IHdyb3RlOgo+PiBJJ3ZlIHB1c2hlZCBhIGRybS1maXhlcy1zdGFnaW5nIGJy YW5jaCB0aGF0IGJhY2twb3J0J3MgRGFuaWVsJ3MKPj4gZHJtLW5leHQgZml4IGZyb20gOSBob3Vy cyBhZ28sCj4+Cj4+IEhvd2V2ZXIgaXQgaXNuJ3QgdGVzdGVkIHlldCwgc28gaWYgeW91IHdhbnQg dG8gZ2l2ZSBpdCBhIHdoaXJsIGdyYWIgaXQuCj4+Cj4+IEhvcGVmdWxseSB3aGVuIERhbmllbCBj b21lcyBvbiBsaW5lIGhlIGNhbiBwcm92aWRlIGFzc3VyYW5jZSB0aGF0IG15Cj4+IGZpeCBpcyBh IGNvcnJlY3QgYmFja3BvcnQuCj4KPiBZb3VyIG1pc3NpbmcgdGhlIGJhY2twb3J0IG9mCj4KPiBj b21taXQgZmI5OTgxYWE2NzVlYjdiMzk4ODQ5OTE1MzY0OTE2ZmQ5ODgzM2NmYQo+IEF1dGhvcjog RGFtaWVuIExlc3BpYXUgPGRhbWllbi5sZXNwaWF1QGludGVsLmNvbT4KPiBEYXRlOiAgIFRodSBG ZWIgNSAxOToyNDoyNSAyMDE1ICswMDAwCj4KPiAgICAgZHJtL2k5MTU6IEZpeCBhdG9taWMgc3Rh dGUgd2hlbiByZXVzaW5nIHRoZSBmaXJtd2FyZSBmYgo+Cj4gTXkgbWFudWFsIGJhY2twb3J0IGlz IGhlcmUKPgo+IGh0dHA6Ly93d3cubWFpbC1hcmNoaXZlLmNvbS9saW51eC1rZXJuZWxAdmdlci5r ZXJuZWwub3JnL21zZzg1NDEzNy5odG1sCj4KPiBUaGUgYmFja3BvcnQgb2YgdGhlIG90aGVyIHBh dGNoIHlvdSBoYXZlIGluIC1zdGFnaW5nIGxvb2tzIGZpbmUuCgpUaGUgZHJtLWludGVsLWZpeGVz IHB1bGwgcmVxdWVzdCBJIGp1c3Qgc2VudCBbMV0gY292ZXJzIGJvdGggb2YKdGhlc2UuIEl0J3Mg b24gdG9wIG9mIGRybS1maXhlcywgaS5lLiBzdXBlcnNlZWRzIC1zdGFnaW5nLgoKQlIsCkphbmku CgpbMV0gaHR0cDovL21pZC5nbWFuZS5vcmcvODdlZ29jcm15Yy5mc2ZAaW50ZWwuY29tCgoKLS0g CkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbbCZMPC (ORCPT ); Thu, 26 Mar 2015 08:15:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:55039 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbbCZMPA (ORCPT ); Thu, 26 Mar 2015 08:15:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,471,1422950400"; d="scan'208";a="546657632" From: Jani Nikula To: Daniel Vetter , Dave Airlie Cc: Linus Torvalds , Linux Kernel Mailing List , DRI mailing list Subject: Re: [git pull] drm urgent fix In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: User-Agent: Notmuch/0.19+87~gcf99a78 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 26 Mar 2015 14:13:51 +0200 Message-ID: <871tkcrm68.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 26 Mar 2015, Daniel Vetter wrote: > On Thu, Mar 26, 2015 at 4:29 AM, Dave Airlie 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 > 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