From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: Re: [PATCH v3] drm: move allocation out of drm_get_format_name() Date: Wed, 9 Nov 2016 16:59:31 +0000 Message-ID: <20161109165931.GR25290@imgtec.com> References: <20161108101558.ihvrprbbdqjwu5wg@phenom.ffwll.local> <20161109001805.10628-1-eric@engestrom.ch> <20161109010916.rpsqcswnlyxggovd@phenom.ffwll.local> <20161109011325.hvvfsvpq734nduxd@phenom.ffwll.local> <20161109114217.GO25290@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline 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: Daniel Vetter Cc: David Airlie , dri-devel , Wei Yongjun , Daniel Vetter , Flora Cui , Gustavo Padovan , Tom St Denis , Chunming Zhou , Thomas Hellstrom , Laurent Pinchart , Sinclair Yeh , Xinliang Liu , Xinwei Kong , VMware Graphics , Vitaly Prosyak , Alexandre Demers , Jani Nikula , intel-gfx , Eric Engestrom , Emily Deng , Junwei Zhang , Mi List-Id: dri-devel@lists.freedesktop.org T24gV2VkbmVzZGF5LCAyMDE2LTExLTA5IDE0OjEzOjQwICswMTAwLCBEYW5pZWwgVmV0dGVyIHdy b3RlOgo+IE9uIFdlZCwgTm92IDksIDIwMTYgYXQgMTI6NDIgUE0sIEVyaWMgRW5nZXN0cm9tCj4g PGVyaWMuZW5nZXN0cm9tQGltZ3RlYy5jb20+IHdyb3RlOgo+ID4+IFdlbGwsIGhhZCB0byBkcm9w IGl0IGFnYWluIHNpbmNlIGl0IGRpZG4ndCBjb21waWxlOgo+ID4+Cj4gPj4KPiA+PiAgIENDIFtN XSAgZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5vCj4gPj4gZHJpdmVycy9ncHUvZHJtL2RybV9h dG9taWMuYzogSW4gZnVuY3Rpb24g4oCYZHJtX2F0b21pY19wbGFuZV9wcmludF9zdGF0ZeKAmToK PiA+PiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jOjkyMDo1OiBlcnJvcjogdG9vIGZldyBh cmd1bWVudHMgdG8gZnVuY3Rpb24g4oCYZHJtX2dldF9mb3JtYXRfbmFtZeKAmQo+ID4+ICAgICAg ZHJtX2dldF9mb3JtYXRfbmFtZShmYi0+cGl4ZWxfZm9ybWF0KSk7Cj4gPj4gICAgICBefn5+fn5+ fn5+fn5+fn5+fn5+Cj4gPj4gSW4gZmlsZSBpbmNsdWRlZCBmcm9tIC4vaW5jbHVkZS9kcm0vZHJt UC5oOjcxOjAsCj4gPj4gICAgICAgICAgICAgICAgICBmcm9tIGRyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljLmM6Mjk6Cj4gPj4gLi9pbmNsdWRlL2RybS9kcm1fZm91cmNjLmg6NjU6Nzogbm90ZTog ZGVjbGFyZWQgaGVyZQo+ID4+ICBjaGFyICpkcm1fZ2V0X2Zvcm1hdF9uYW1lKHVpbnQzMl90IGZv cm1hdCwgc3RydWN0IGRybV9mb3JtYXRfbmFtZV9idWYgKmJ1Zik7Cj4gPj4gICAgICAgIF5+fn5+ fn5+fn5+fn5+fn5+fn4KPiA+Pgo+ID4+IENhbiB5b3UgcGxzIHJlYmFzZSBvbnRvIGRybS1taXNj IG9yIGxpbnV4LW5leHQgb3Igc29tZXRoaW5nPwo+ID4KPiA+IFRoYXQgd2FzIGJhc2VkIG9uIGFp cmxpZWQvZHJtLW5leHQgKGxhc3QgZmV0Y2hlZCBvbiBTdW5kYXkgSSB0aGluayksCj4gPiBJIGNh biByZWJhc2UgaXQgb24gZHJtLW1pc2MgaWYgaXQgaGVscHMsIGJ1dCBpdCBzZWVtcyBvbGRlciB0 aGFuCj4gPiBkcm0tbmV4dC4KPiA+IFNob3VsZCBJIGp1c3QgcmViYXNlIG9uIHRvcCBvZiBjdXJy ZW50IGhlYWQgb2YgZHJtLW5leHQ/Cj4gCj4gSXQgbmVlZHMgdG8gYmUgZHJtLW1pc2MgKGxpbnV4 LW5leHQgZG9lc24ndCBoYXZlIGl0IHlldCkgZHVlIHRvIHRoZQo+IG5ldyBhdG9taWMgZGVidWcg d29yayB0aGF0IHdlIGp1c3QgbGFuZGVkLiBJJ20gd29ya2luZyBvbiBkcm0tdGlwIGFzIGEKPiBk cm0gbG9jYWwgaW50ZWdyYXRpb24gdHJlZSB0byBlYXNlIHBhaW5zIGxpa2UgdGhlc2UgYSBiaXQs IGJ1dCB0aGF0Cj4gZG9lc24ndCByZWFsbHkgZXhpc3QgeWV0LgoKSSdtIGNvbmZ1c2VkIGFzIHRv IGhvdyB0aGUgZGlmZmVyZW50IHRyZWVzIGFuZCBicmFuY2hlcyBtZXJnZSBiYWNrIHRvClRvcnZh bGRzJyB0cmVlIChJJ20gaW50ZXJlc3RlZCBpbiBwYXJ0aWN1bGFyIGluIGRybSksIGFuZCBJJ20g bm90IHN1cmUKd2hpY2ggYnJhbmNoIHlvdSB3YW50IG1lIHRvIHJlYmFzZSBvbiBpbiB0aGUgZHJt LW1pc2MgdHJlZSBbMV0sCmVzcGVjaWFsbHkgc2luY2UgYWxsIG9mIHRoZW0gYXJlIG9sZGVyIHRo YW4gZHJtLW5leHQgWzJdLgoKSSdsbCB0cnkgdG8gcmViYXNlIG9uIGRybS1taXNjLWZpeGVzIChj dXJyZW50bHkgYXQgNGRhNWNhYTZhNmY4MmNkYTMxOTMpCmFzIGl0IHNvdW5kcyBhYm91dCByaWdo dCwgYnV0IGl0IGRvZXNuJ3QgYXBwbHkgYXQgYWxsLCBzbyBpdCdsbCB0YWtlCmEgbGl0dGxlIHdo aWxlLgoKQ291bGQgeW91IGdpdmUgbWUgYSBxdWljayBleHBsYW5hdGlvbiBvciBwb2ludCBtZSB0 byBhIGRvYy9wYWdlIHRoYXQKZXhwbGFpbnMgaG93IHRoZSB2YXJpb3VzIHRyZWVzIGFuZCBicmFu Y2hlcyBnZXQgbWVyZ2VkPwpJIGdvb2dsZWQgYSBiaXQgYW5kIGZvdW5kIHRoaXMgZG9jIFs0XSBi eSBKYW5pLCBidXQgaXQgZG9lc24ndCBtZW50aW9uCmRybS1taXNjIGZvciBpbnN0YW5jZSwgc28g SSdtIG5vdCBzdXJlIGhvdyB1cC10by1kYXRlIGFuZApub24taW50ZWwtc3BlY2lmaWMgaXQgaXMu CgpMb29raW5nIGF0IHRoaXMgcGFnZSwgc29tZXRoaW5nIGp1c3Qgb2NjdXJyZWQgdG8gbWU6IGRp ZCB5b3UgbWVhbgpkcm0tZml4ZXMgWzNdLCBpbnN0ZWFkIG9mIG9uZSBvZiB0aGUgYnJhbmNoZXMg b24gZHJtLW1pc2M/CgpDaGVlcnMsCiAgRXJpYwoKWzFdIGdpdDovL2Fub25naXQuZnJlZWRlc2t0 b3Aub3JnL2RybS9kcm0tbWlzYwpbMl0gZ2l0Oi8vcGVvcGxlLmZyZWVkZXNrdG9wLm9yZy9+YWly bGllZC9saW51eCBkcm0tbmV4dApbMl0gZ2l0Oi8vcGVvcGxlLmZyZWVkZXNrdG9wLm9yZy9+YWly bGllZC9saW51eCBkcm0tZml4ZXMKWzNdIGh0dHBzOi8vMDEub3JnL2xpbnV4Z3JhcGhpY3MvZ2Z4 LWRvY3MvbWFpbnRhaW5lci10b29scy9kcm0taW50ZWwuaHRtbApfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754500AbcKIQ7h (ORCPT ); Wed, 9 Nov 2016 11:59:37 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:22714 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754345AbcKIQ7f (ORCPT ); Wed, 9 Nov 2016 11:59:35 -0500 Date: Wed, 9 Nov 2016 16:59:31 +0000 From: Eric Engestrom To: Daniel Vetter CC: Eric Engestrom , Linux Kernel Mailing List , David Airlie , dri-devel , Wei Yongjun , Daniel Vetter , Flora Cui , Gustavo Padovan , Tom St Denis , Chunming Zhou , Thomas Hellstrom , Laurent Pinchart , Sinclair Yeh , Xinliang Liu , Xinwei Kong , VMware Graphics , Vitaly Prosyak , Alexandre Demers , Jani Nikula , intel-gfx , Emily Deng , Colin Ian King , Junwei Zhang , Michel =?utf-8?Q?D=C3=A4nzer?= , Alex Deucher , Christian =?utf-8?B?S8O2bmln?= Subject: Re: [Intel-gfx] [PATCH v3] drm: move allocation out of drm_get_format_name() Message-ID: <20161109165931.GR25290@imgtec.com> References: <20161108101558.ihvrprbbdqjwu5wg@phenom.ffwll.local> <20161109001805.10628-1-eric@engestrom.ch> <20161109010916.rpsqcswnlyxggovd@phenom.ffwll.local> <20161109011325.hvvfsvpq734nduxd@phenom.ffwll.local> <20161109114217.GO25290@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.7.1 (2016-10-04) X-Originating-IP: [10.60.4.28] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, 2016-11-09 14:13:40 +0100, Daniel Vetter wrote: > On Wed, Nov 9, 2016 at 12:42 PM, Eric Engestrom > wrote: > >> Well, had to drop it again since it didn't compile: > >> > >> > >> CC [M] drivers/gpu/drm/drm_blend.o > >> drivers/gpu/drm/drm_atomic.c: In function ‘drm_atomic_plane_print_state’: > >> drivers/gpu/drm/drm_atomic.c:920:5: error: too few arguments to function ‘drm_get_format_name’ > >> drm_get_format_name(fb->pixel_format)); > >> ^~~~~~~~~~~~~~~~~~~ > >> In file included from ./include/drm/drmP.h:71:0, > >> from drivers/gpu/drm/drm_atomic.c:29: > >> ./include/drm/drm_fourcc.h:65:7: note: declared here > >> char *drm_get_format_name(uint32_t format, struct drm_format_name_buf *buf); > >> ^~~~~~~~~~~~~~~~~~~ > >> > >> Can you pls rebase onto drm-misc or linux-next or something? > > > > That was based on airlied/drm-next (last fetched on Sunday I think), > > I can rebase it on drm-misc if it helps, but it seems older than > > drm-next. > > Should I just rebase on top of current head of drm-next? > > It needs to be drm-misc (linux-next doesn't have it yet) due to the > new atomic debug work that we just landed. I'm working on drm-tip as a > drm local integration tree to ease pains like these a bit, but that > doesn't really exist yet. I'm confused as to how the different trees and branches merge back to Torvalds' tree (I'm interested in particular in drm), and I'm not sure which branch you want me to rebase on in the drm-misc tree [1], especially since all of them are older than drm-next [2]. I'll try to rebase on drm-misc-fixes (currently at 4da5caa6a6f82cda3193) as it sounds about right, but it doesn't apply at all, so it'll take a little while. Could you give me a quick explanation or point me to a doc/page that explains how the various trees and branches get merged? I googled a bit and found this doc [4] by Jani, but it doesn't mention drm-misc for instance, so I'm not sure how up-to-date and non-intel-specific it is. Looking at this page, something just occurred to me: did you mean drm-fixes [3], instead of one of the branches on drm-misc? Cheers, Eric [1] git://anongit.freedesktop.org/drm/drm-misc [2] git://people.freedesktop.org/~airlied/linux drm-next [2] git://people.freedesktop.org/~airlied/linux drm-fixes [3] https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-intel.html