[Intel-gfx] [PATCH] drm/i915: Set the map-and-fenceable flag for preallocated objects

[Jani Nikula]

On Thu, 27 Aug 2015, Chris Wilson <chris at chris-wilson.co.uk> 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 <daniel at ffwll.ch> 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 <chris at chris-wilson.co.uk>
>> >>> Cc: "Goel, Akash" <akash.goel at intel.com>
>> >>> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
>> >>> Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
>> >>> Cc: stable at vger.kernel.org
>> >>
>> >> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
>> >>
>> >> 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