From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects Date: Fri, 28 Aug 2015 10:00:44 +0300 Message-ID: <87bndr7v8j.fsf@intel.com> References: <1440521310-8931-1-git-send-email-chris@chris-wilson.co.uk> <1440590157-4423-1-git-send-email-chris@chris-wilson.co.uk> <20150826130659.GP1367@phenom.ffwll.local> <87zj1dw2ku.fsf@intel.com> <55DF3886.1060001@virtuousgeek.org> <20150827163640.GQ17184@nuc-i3427.alporthouse.com> 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 35DD4A43F for ; Thu, 27 Aug 2015 23:57:42 -0700 (PDT) In-Reply-To: <20150827163640.GQ17184@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Jesse Barnes Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, "Goel, Akash" List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAyNyBBdWcgMjAxNSwgQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+IHdyb3RlOgo+IE9uIFRodSwgQXVnIDI3LCAyMDE1IGF0IDA5OjE5OjE4QU0gLTA3MDAsIEpl c3NlIEJhcm5lcyB3cm90ZToKPj4gT24gMDgvMjcvMjAxNSAwMTozNiBBTSwgSmFuaSBOaWt1bGEg d3JvdGU6Cj4+ID4gT24gV2VkLCAyNiBBdWcgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZm d2xsLmNoPiB3cm90ZToKPj4gPj4gT24gV2VkLCBBdWcgMjYsIDIwMTUgYXQgMTI6NTU6NTdQTSAr MDEwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+PiA+Pj4gQXMgd2UgbWFyayB0aGUgcHJlYWxsb2Nh dGVkIG9iamVjdHMgYXMgYm91bmQsIHdlIHNob3VsZCBhbHNvIGZsYWcgdGhlbQo+PiA+Pj4gY29y cmVjdGx5IGFzIGJlaW5nIG1hcC1hbmQtZmVuY2VhYmxlIChpZiBhcHByb3ByaWF0ZSEpIHNvIHRo YXQgbGF0dGVyCj4+ID4+PiB1c2VycyBkbyBub3QgZ2V0IGNvbmZ1c2VkIGFuZCB0cnkgYW5kIHJl YmluZCB0aGUgcGlubmVkIHZtYSBpbiBvcmRlciB0bwo+PiA+Pj4gZ2V0IGEgbWFwLWFuZC1mZW5j ZWFibGUgYmluZGluZy4KPj4gPj4+Cj4+ID4+PiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPj4gPj4+IENjOiAiR29lbCwgQWthc2giIDxha2Fz aC5nb2VsQGludGVsLmNvbT4KPj4gPj4+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVy QGZmd2xsLmNoPgo+PiA+Pj4gQ2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dlZWsu b3JnPgo+PiA+Pj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPj4gPj4KPj4gPj4gUmV2aWV3 ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4+ID4+Cj4+ID4+ IEphbmksIGNhbiB5b3UgcGxlYXNlIHBpY2sgdXAgYm90aD8gQW5kIHNvbWUgYnVnemlsbGEgcmVm ZXJlbmNlcyBmb3IgZWl0aGVyCj4+ID4+IHdvdWxkIGJlIGdyZWF0IHRvbyAtIENocmlzPwo+PiA+ IAo+PiA+IEJvdGggcHVzaGVkIHRvIGRybS1pbnRlbC1uZXh0LWZpeGVzLiBUaGFua3MgZm9yIHRo ZSBwYXRjaGVzIGFuZCByZXZpZXcuCj4+IAo+PiBUaGlzIG9uZSBicmVha3MgbXkgSFNXLiAgSSBo aXQgdGhlIHdhcm4gaW4gCj4+IAo+PiAKPj4gaW50Cj4+IGk5MTVfZ2VtX29iamVjdF9nZ3R0X3Bp bihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAo+PiAJCQkgY29uc3Qgc3RydWN0IGk5 MTVfZ2d0dF92aWV3ICp2aWV3LAo+PiAJCQkgdWludDMyX3QgYWxpZ25tZW50LAo+PiAJCQkgdWlu dDY0X3QgZmxhZ3MpCj4+IHsKPj4gCWlmIChXQVJOX09OQ0UoIXZpZXcsICJubyB2aWV3IHNwZWNp ZmllZCIpKQo+PiAJCXJldHVybiAtRUlOVkFMOwo+PiAKPj4gCXJldHVybiBpOTE1X2dlbV9vYmpl Y3RfZG9fcGluKG9iaiwgaTkxNV9vYmpfdG9fZ2d0dChvYmopLCB2aWV3LAo+PiAJCQkJICAgICAg YWxpZ25tZW50LCBmbGFncyB8IFBJTl9HTE9CQUwpOwo+PiB9Cj4+IAo+PiBhbmQgdGhlIGZiIGNv bnNvbGUgZG9lc24ndCBjb21lIHVwLiAgSXMgdGhpcyBhIG1lcmdlIGVycm9yIHNvbWVob3c/ICBJ IGRvbid0IHNlZSBob3cgaXQgY291bGQgaGF2ZSB3b3JrZWQuLi4gbWF5YmUgdy9vIGZiZGV2IGVu YWJsZWQgb3Igc29tZXRoaW5nPwo+Cj4gTm8sIGl0IHdhcyBqdXN0IHdyaXR0ZW4gYWdhaW5zdCBh IGRpZmZlcmVudCBwaW4gaW50ZXJmYWNlLgo+Cj4gVXNlIGk5MTVfZ2VtX29ial9nZ3R0X3Bpbigp IGluc3RlYWQuCj4KPiBFeGFjdGx5LgoKQm90aCBwYXRjaGVzIGRyb3BwZWQgZnJvbSBkcm0taW50 ZWwtbmV4dC1maXhlcy4KCkJSLApKYW5pLgoKCj4gLUNocmlzCj4KPiAtLSAKPiBDaHJpcyBXaWxz b24sIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudHJlCgotLSAKSmFuaSBOaWt1bGEs IEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:30435 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725AbbH1G5o (ORCPT ); Fri, 28 Aug 2015 02:57:44 -0400 From: Jani Nikula To: Chris Wilson , Jesse Barnes Cc: Daniel Vetter , Daniel Vetter , intel-gfx@lists.freedesktop.org, "Goel\, Akash" , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects In-Reply-To: <20150827163640.GQ17184@nuc-i3427.alporthouse.com> References: <1440521310-8931-1-git-send-email-chris@chris-wilson.co.uk> <1440590157-4423-1-git-send-email-chris@chris-wilson.co.uk> <20150826130659.GP1367@phenom.ffwll.local> <87zj1dw2ku.fsf@intel.com> <55DF3886.1060001@virtuousgeek.org> <20150827163640.GQ17184@nuc-i3427.alporthouse.com> Date: Fri, 28 Aug 2015 10:00:44 +0300 Message-ID: <87bndr7v8j.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Thu, 27 Aug 2015, Chris Wilson wrote: > On Thu, Aug 27, 2015 at 09:19:18AM -0700, Jesse Barnes wrote: >> On 08/27/2015 01:36 AM, Jani Nikula wrote: >> > On Wed, 26 Aug 2015, Daniel Vetter wrote: >> >> On Wed, Aug 26, 2015 at 12:55:57PM +0100, Chris Wilson wrote: >> >>> As we mark the preallocated objects as bound, we should also flag them >> >>> correctly as being map-and-fenceable (if appropriate!) so that latter >> >>> users do not get confused and try and rebind the pinned vma in order to >> >>> get a map-and-fenceable binding. >> >>> >> >>> Signed-off-by: Chris Wilson >> >>> Cc: "Goel, Akash" >> >>> Cc: Daniel Vetter >> >>> Cc: Jesse Barnes >> >>> Cc: stable@vger.kernel.org >> >> >> >> Reviewed-by: Daniel Vetter >> >> >> >> Jani, can you please pick up both? And some bugzilla references for either >> >> would be great too - Chris? >> > >> > Both pushed to drm-intel-next-fixes. Thanks for the patches and review. >> >> This one breaks my HSW. I hit the warn in >> >> >> int >> i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, >> const struct i915_ggtt_view *view, >> uint32_t alignment, >> uint64_t flags) >> { >> if (WARN_ONCE(!view, "no view specified")) >> return -EINVAL; >> >> return i915_gem_object_do_pin(obj, i915_obj_to_ggtt(obj), view, >> alignment, flags | PIN_GLOBAL); >> } >> >> and the fb console doesn't come up. Is this a merge error somehow? I don't see how it could have worked... maybe w/o fbdev enabled or something? > > No, it was just written against a different pin interface. > > Use i915_gem_obj_ggtt_pin() instead. > > Exactly. Both patches dropped from drm-intel-next-fixes. BR, Jani. > -Chris > > -- > Chris Wilson, Intel Open Source Technology Centre -- Jani Nikula, Intel Open Source Technology Center