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

Commit 03e39104 authored by Paulo Zanoni's avatar Paulo Zanoni
Browse files

drm/i915/fbc: move the intel_fbc_can_choose() call out of the loop 



We can just call it earlier, so do it. The goal of the loop is to get
the plane's CRTC state, and we don't need it in order to call
intel_fbc_can_choose().

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1478883461-20201-2-git-send-email-paulo.r.zanoni@intel.com
parent 4d1368f7

drivers/gpu/drm/i915/intel_fbc.c

+3 −3
Original line number Diff line number Diff line
@@ -1096,6 +1096,9 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv, 
		if (!intel_plane_state->base.visible)

			continue;



		if (!intel_fbc_can_choose(to_intel_crtc(plane_state->crtc)))

			continue;



		for_each_crtc_in_state(state, crtc, crtc_state, j) {

			struct intel_crtc_state *intel_crtc_state =

				to_intel_crtc_state(crtc_state);
@@ -1103,9 +1106,6 @@ void intel_fbc_choose_crtc(struct drm_i915_private *dev_priv, 
			if (plane_state->crtc != crtc)

				continue;



			if (!intel_fbc_can_choose(to_intel_crtc(crtc)))

				break;



			intel_crtc_state->enable_fbc = true;

			goto out;

		}