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