Commit 9807216f authored Oct 29, 2015 by Vivek Kasireddy Committed by Jani Nikula Nov 05, 2015

drm/i915: Skip fence installation for objects with rotated views (v4)



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.

v4:
Extend the "view type is normal" check for pin_fence as well.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446170078-20792-1-git-send-email-vivek.kasireddy@intel.com


Signed-off-by: Jani Nikula <jani.nikula@intel.com>

parent 9be64eee

drivers/gpu/drm/i915/intel_display.c

+20 −16

Original line number	Diff line number	Diff line
		@@ -2389,6 +2389,7 @@ 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.
		*/
		if (view.type == I915_GGTT_VIEW_NORMAL) {
		ret = i915_gem_object_get_fence(obj);
		if (ret == -EDEADLK) {
		/*
		@@ -2405,6 +2406,7 @@ intel_pin_and_fence_fb_obj(struct drm_plane *plane,
		goto err_unpin;

		i915_gem_object_pin_fence(obj);
		}

		dev_priv->mm.interruptible = true;
		intel_runtime_pm_put(dev_priv);
		@@ -2430,7 +2432,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!");

		if (view.type == I915_GGTT_VIEW_NORMAL)
		i915_gem_object_unpin_fence(obj);

		i915_gem_object_unpin_from_display_plane(obj, &view);
		}

Admin message