Commit 62d4874b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/fbc: Flatten __intel_fbc_pre_update() 



Use an early return to flatten most of __intel_fbc_pre_update().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211124113652.22090-10-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
parent 004f80f9

drivers/gpu/drm/i915/display/intel_fbc.c

+21 −21
Original line number Diff line number Diff line
@@ -1223,7 +1223,9 @@ static bool __intel_fbc_pre_update(struct intel_atomic_state *state, 
	intel_fbc_update_state_cache(state, crtc, plane);

	fbc->flip_pending = true;



	if (!intel_fbc_can_flip_nuke(state, crtc, plane)) {

	if (intel_fbc_can_flip_nuke(state, crtc, plane))

		return need_vblank_wait;



	intel_fbc_deactivate(fbc, "update pending");



	/*
@@ -1239,11 +1241,9 @@ static bool __intel_fbc_pre_update(struct intel_atomic_state *state, 
	 * and skipping the extra vblank wait before the plane update

	 * if at least one frame has already passed.

	 */

		if (fbc->activated &&

		    DISPLAY_VER(i915) >= 10)

	if (fbc->activated && DISPLAY_VER(i915) >= 10)

		need_vblank_wait = true;

	fbc->activated = false;

	}



	return need_vblank_wait;

}