On 08/27/2015 01:36 AM, Jani Nikula wrote: > On Wed, 26 Aug 2015, Daniel Vetter <daniel@xxxxxxxx> 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@xxxxxxxxxxxxxxxxxx> >>> Cc: "Goel, Akash" <akash.goel@xxxxxxxxx> >>> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> >>> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> >>> Cc: stable@xxxxxxxxxxxxxxx >> >> Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> >> >> 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 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx