From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects Date: Thu, 27 Aug 2015 09:19:18 -0700 Message-ID: <55DF3886.1060001@virtuousgeek.org> 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> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from gproxy9-pub.mail.unifiedlayer.com (gproxy9-pub.mail.unifiedlayer.com [69.89.20.122]) by gabe.freedesktop.org (Postfix) with SMTP id 220B56E678 for ; Thu, 27 Aug 2015 09:19:41 -0700 (PDT) In-Reply-To: <87zj1dw2ku.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , Daniel Vetter , Chris Wilson Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, "Goel, Akash" , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gMDgvMjcvMjAxNSAwMTozNiBBTSwgSmFuaSBOaWt1bGEgd3JvdGU6Cj4gT24gV2VkLCAyNiBB dWcgMjAxNSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90ZToKPj4gT24gV2Vk LCBBdWcgMjYsIDIwMTUgYXQgMTI6NTU6NTdQTSArMDEwMCwgQ2hyaXMgV2lsc29uIHdyb3RlOgo+ Pj4gQXMgd2UgbWFyayB0aGUgcHJlYWxsb2NhdGVkIG9iamVjdHMgYXMgYm91bmQsIHdlIHNob3Vs ZCBhbHNvIGZsYWcgdGhlbQo+Pj4gY29ycmVjdGx5IGFzIGJlaW5nIG1hcC1hbmQtZmVuY2VhYmxl IChpZiBhcHByb3ByaWF0ZSEpIHNvIHRoYXQgbGF0dGVyCj4+PiB1c2VycyBkbyBub3QgZ2V0IGNv bmZ1c2VkIGFuZCB0cnkgYW5kIHJlYmluZCB0aGUgcGlubmVkIHZtYSBpbiBvcmRlciB0bwo+Pj4g Z2V0IGEgbWFwLWFuZC1mZW5jZWFibGUgYmluZGluZy4KPj4+Cj4+PiBTaWduZWQtb2ZmLWJ5OiBD aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPj4+IENjOiAiR29lbCwgQWth c2giIDxha2FzaC5nb2VsQGludGVsLmNvbT4KPj4+IENjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgo+Pj4gQ2M6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2aXJ0dW91c2dl ZWsub3JnPgo+Pj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPj4KPj4gUmV2aWV3ZWQtYnk6 IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4+Cj4+IEphbmksIGNhbiB5 b3UgcGxlYXNlIHBpY2sgdXAgYm90aD8gQW5kIHNvbWUgYnVnemlsbGEgcmVmZXJlbmNlcyBmb3Ig ZWl0aGVyCj4+IHdvdWxkIGJlIGdyZWF0IHRvbyAtIENocmlzPwo+IAo+IEJvdGggcHVzaGVkIHRv IGRybS1pbnRlbC1uZXh0LWZpeGVzLiBUaGFua3MgZm9yIHRoZSBwYXRjaGVzIGFuZCByZXZpZXcu CgpUaGlzIG9uZSBicmVha3MgbXkgSFNXLiAgSSBoaXQgdGhlIHdhcm4gaW4gCgoKaW50Cmk5MTVf Z2VtX29iamVjdF9nZ3R0X3BpbihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAoJCQkg Y29uc3Qgc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LAoJCQkgdWludDMyX3QgYWxpZ25tZW50 LAoJCQkgdWludDY0X3QgZmxhZ3MpCnsKCWlmIChXQVJOX09OQ0UoIXZpZXcsICJubyB2aWV3IHNw ZWNpZmllZCIpKQoJCXJldHVybiAtRUlOVkFMOwoKCXJldHVybiBpOTE1X2dlbV9vYmplY3RfZG9f cGluKG9iaiwgaTkxNV9vYmpfdG9fZ2d0dChvYmopLCB2aWV3LAoJCQkJICAgICAgYWxpZ25tZW50 LCBmbGFncyB8IFBJTl9HTE9CQUwpOwp9CgphbmQgdGhlIGZiIGNvbnNvbGUgZG9lc24ndCBjb21l IHVwLiAgSXMgdGhpcyBhIG1lcmdlIGVycm9yIHNvbWVob3c/ICBJIGRvbid0IHNlZSBob3cgaXQg Y291bGQgaGF2ZSB3b3JrZWQuLi4gbWF5YmUgdy9vIGZiZGV2IGVuYWJsZWQgb3Igc29tZXRoaW5n PwoKVGhhbmtzLApKZXNzZQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy7-pub.mail.unifiedlayer.com ([70.40.196.235]:35513 "HELO gproxy7-pub.mail.unifiedlayer.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753592AbbH0Q0V (ORCPT ); Thu, 27 Aug 2015 12:26:21 -0400 Message-ID: <55DF3886.1060001@virtuousgeek.org> Date: Thu, 27 Aug 2015 09:19:18 -0700 From: Jesse Barnes MIME-Version: 1.0 To: Jani Nikula , Daniel Vetter , Chris Wilson CC: 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 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> In-Reply-To: <87zj1dw2ku.fsf@intel.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: 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? Thanks, Jesse