On Wed, Oct 28, 2015 at 06:24:19PM -0700, Vivek Kasireddy wrote: > While pinning a fb object to the display plane, only install a fence > if the object is using a normal view. This corresponds with the > behavior found in i915_gem_object_do_pin() where the fencability > criteria is determined only for objects with normal views. > > v2: > Look at the object's map_and_fenceable flag to determine whether to > install a fence or not (Chris). > > v3: > Pin and unpin a fence only if the current view type is normal. > > Cc: Chris Wilson <ch...@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursu...@intel.com> > Cc: Ville Syrjala <ville.syrj...@linux.intel.com> > Signed-off-by: Vivek Kasireddy <vivek.kasire...@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 2fdfca1..ac06f8c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -2419,7 +2419,8 @@ intel_pin_and_fence_fb_obj(struct drm_plane *plane, > * framebuffer compression. For simplicity, we always install > * a fence as the cost is not that onerous. > */ > - ret = i915_gem_object_get_fence(obj); > + if (view.type == I915_GGTT_VIEW_NORMAL) > + ret = i915_gem_object_get_fence(obj);
Missing the same check for the pin_fence(). > if (ret == -EDEADLK) { > /* > * -EDEADLK means there are no free fences > @@ -2460,7 +2461,9 @@ static void intel_unpin_fb_obj(struct drm_framebuffer > *fb, > ret = intel_fill_fb_ggtt_view(&view, fb, plane_state); > WARN_ONCE(ret, "Couldn't get view from plane state!"); > > - i915_gem_object_unpin_fence(obj); > + if (view.type == I915_GGTT_VIEW_NORMAL) > + i915_gem_object_unpin_fence(obj); > + > i915_gem_object_unpin_from_display_plane(obj, &view); > } > > -- > 2.4.3 -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx