From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965604AbbCPPGN (ORCPT ); Mon, 16 Mar 2015 11:06:13 -0400 Received: from mga09.intel.com ([134.134.136.24]:6899 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933062AbbCPPGJ (ORCPT ); Mon, 16 Mar 2015 11:06:09 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,409,1422950400"; d="scan'208";a="692819835" From: Jani Nikula To: Xi Ruoyao , Stephen Rothwell , Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20150316133049.39f516f2@canb.auug.org.au> User-Agent: Notmuch/0.19+72~gd7c02cb (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Mon, 16 Mar 2015 17:04:31 +0200 Message-ID: <873855ouf4.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 Mon, 16 Mar 2015, Xi Ruoyao wrote: > On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote: >> Hi Dave, >> >> Today's linux-next merge of the drm tree got a conflict in >> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45 >> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from >> the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure >> plane->state->fb stays in sync with plane->fb"), f55548b5af87 >> ("drm/i915: Don't try to reference the fb in >> get_initial_plane_config()") and presumably others from the drm tree. >> >> Same patch summary, different authors, committers and added function. >> >> I fixed it up (I effectively used the drm tree version) and can carry >> the fix as necessary (no action is required). >> > My patch with commit 2dccc9898d45 is for Linux 4.0-rcN. It has no > relationship > with linux-next since Matt Roper's afd65eb4cc05 has solved this long > long ago. The relationship is that -next will eventually merge to Linus' master, so Matt's commit will conflict with yours. Your commit is taking the fast path to the kernel. But you don't have to worry about it, it's all taken care of. And per what Stephen says, he has done the right thing. > BTW, there is still one thing should be done in linux-next. We should > change > Matt's update_state_fb to use drm_atomic_set_fb_for_plane since the logic of > Matt's code is duplicated with drm_atomic_set_fb_for_plane. Patches welcome in intel-gfx list; the audience here is too wide. ;) BR, Jani. -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Mon, 16 Mar 2015 17:04:31 +0200 Message-ID: <873855ouf4.fsf@intel.com> References: <20150316133049.39f516f2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Xi Ruoyao , Stephen Rothwell , Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org T24gTW9uLCAxNiBNYXIgMjAxNSwgWGkgUnVveWFvIDx4cnkxMTFAb3V0bG9vay5jb20+IHdyb3Rl Ogo+IE9uIDAzLzE2LzIwMTUgYXQgMTA6MzAgQU0sIFN0ZXBoZW4gUm90aHdlbGwgd3JvdGU6Cj4+ IEhpIERhdmUsCj4+Cj4+IFRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUg Z290IGEgY29uZmxpY3QgaW4KPj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IGJldHdlZW4gY29tbWl0IDJkY2NjOTg5OGQ0NQo+PiAoImRybS9pOTE1OiBFbnN1cmUgcGxhbmUt PnN0YXRlLT5mYiBzdGF5cyBpbiBzeW5jIHdpdGggcGxhbmUtPmZiIikgZnJvbQo+PiB0aGUgZHJt LWludGVsLWZpeGVzIHRyZWUgYW5kIGNvbW1pdCBhZmQ2NWViNGNjMDUgKCJkcm0vaTkxNTogRW5z dXJlCj4+IHBsYW5lLT5zdGF0ZS0+ZmIgc3RheXMgaW4gc3luYyB3aXRoIHBsYW5lLT5mYiIpLCBm NTU1NDhiNWFmODcKPj4gKCJkcm0vaTkxNTogRG9uJ3QgdHJ5IHRvIHJlZmVyZW5jZSB0aGUgZmIg aW4KPj4gZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKCkiKSBhbmQgcHJlc3VtYWJseSBvdGhlcnMg ZnJvbSB0aGUgZHJtIHRyZWUuCj4+Cj4+IFNhbWUgcGF0Y2ggc3VtbWFyeSwgZGlmZmVyZW50IGF1 dGhvcnMsIGNvbW1pdHRlcnMgYW5kIGFkZGVkIGZ1bmN0aW9uLgo+Pgo+PiBJIGZpeGVkIGl0IHVw IChJIGVmZmVjdGl2ZWx5IHVzZWQgdGhlIGRybSB0cmVlIHZlcnNpb24pIGFuZCBjYW4gY2FycnkK Pj4gdGhlIGZpeCBhcyBuZWNlc3NhcnkgKG5vIGFjdGlvbiBpcyByZXF1aXJlZCkuCj4+Cj4gTXkg cGF0Y2ggd2l0aCBjb21taXQgMmRjY2M5ODk4ZDQ1IGlzIGZvciBMaW51eCA0LjAtcmNOLiBJdCBo YXMgbm8gCj4gcmVsYXRpb25zaGlwCj4gICB3aXRoIGxpbnV4LW5leHQgc2luY2UgTWF0dCBSb3Bl cidzIGFmZDY1ZWI0Y2MwNSBoYXMgc29sdmVkIHRoaXMgbG9uZyAKPiBsb25nIGFnby4KClRoZSBy ZWxhdGlvbnNoaXAgaXMgdGhhdCAtbmV4dCB3aWxsIGV2ZW50dWFsbHkgbWVyZ2UgdG8gTGludXMn IG1hc3RlciwKc28gTWF0dCdzIGNvbW1pdCB3aWxsIGNvbmZsaWN0IHdpdGggeW91cnMuIFlvdXIg Y29tbWl0IGlzIHRha2luZyB0aGUKZmFzdCBwYXRoIHRvIHRoZSBrZXJuZWwuIEJ1dCB5b3UgZG9u J3QgaGF2ZSB0byB3b3JyeSBhYm91dCBpdCwgaXQncyBhbGwKdGFrZW4gY2FyZSBvZi4gQW5kIHBl ciB3aGF0IFN0ZXBoZW4gc2F5cywgaGUgaGFzIGRvbmUgdGhlIHJpZ2h0IHRoaW5nLgoKPiBCVFcs IHRoZXJlIGlzIHN0aWxsIG9uZSB0aGluZyBzaG91bGQgYmUgZG9uZSBpbiBsaW51eC1uZXh0LiBX ZSBzaG91bGQgCj4gY2hhbmdlCj4gTWF0dCdzIHVwZGF0ZV9zdGF0ZV9mYiB0byB1c2UgZHJtX2F0 b21pY19zZXRfZmJfZm9yX3BsYW5lIHNpbmNlIHRoZSBsb2dpYyBvZgo+IE1hdHQncyBjb2RlIGlz IGR1cGxpY2F0ZWQgd2l0aCBkcm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUuCgpQYXRjaGVzIHdl bGNvbWUgaW4gaW50ZWwtZ2Z4IGxpc3Q7IHRoZSBhdWRpZW5jZSBoZXJlIGlzIHRvbyB3aWRlLiA7 KQoKQlIsCkphbmkuCgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9s b2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=