Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcf38d13 authored by Paulo Zanoni's avatar Paulo Zanoni
Browse files

drm/i915/fbc: unconditionally update FBC during atomic commits 



We unconditionally disable/update FBC even during the page flip
IOCTLs, and an unconditional disable/update at every atomic commit
touching the primary plane shouldn't impact PC state residency
noticeably. Besides, the code that checks for rotation is a good hint
that we may be forgetting something else, so let's leave all the
decisions to intel_fbc.c, making the code much safer.

Once we have the code to properly make FBC enable/update decisions
based on atomic states, with proper locking, then we'll be able to
evaluate whether it will be worth trying to optimize the cases where a
disable isn't needed.

v2: Upstream moved and now our patch needs to remove dev_priv.

Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453406837-10511-1-git-send-email-paulo.r.zanoni@intel.com
parent 261fe99a

drivers/gpu/drm/i915/intel_display.c

+2 −21
Original line number Diff line number Diff line
@@ -11834,7 +11834,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct drm_plane *plane = plane_state->plane;

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_plane_state *old_plane_state =

		to_intel_plane_state(plane->state);

	int idx = intel_crtc->base.base.id, ret;
@@ -11902,6 +11901,8 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
	case DRM_PLANE_TYPE_PRIMARY:

		intel_crtc->atomic.pre_disable_primary = turn_off;

		intel_crtc->atomic.post_enable_primary = turn_on;

		intel_crtc->atomic.disable_fbc = true;

		intel_crtc->atomic.update_fbc = true;



		if (turn_off) {

			/*
@@ -11913,27 +11914,8 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
			 * disable.

			 */

			intel_crtc->atomic.disable_ips = true;



			intel_crtc->atomic.disable_fbc = true;

		}



		/*

		 * FBC does not work on some platforms for rotated

		 * planes, so disable it when rotation is not 0 and

		 * update it when rotation is set back to 0.

		 *

		 * FIXME: This is redundant with the fbc update done in

		 * the primary plane enable function except that that

		 * one is done too late. We eventually need to unify

		 * this.

		 */



		if (visible &&

		    INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev) &&

		    dev_priv->fbc.crtc == intel_crtc &&

		    plane_state->rotation != BIT(DRM_ROTATE_0))

			intel_crtc->atomic.disable_fbc = true;



		/*

		 * BDW signals flip done immediately if the plane

		 * is disabled, even if the plane enable is already
@@ -11942,7 +11924,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, 
		if (turn_on && IS_BROADWELL(dev))

			intel_crtc->atomic.wait_vblank = true;



		intel_crtc->atomic.update_fbc |= visible || mode_changed;

		break;

	case DRM_PLANE_TYPE_CURSOR:

		break;