Commit 88a173e5 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

drm/i915: Reject async flips with bigjoiner 

Currently async flips are busted when bigjoiner is in use.
As a short term fix simply reject async flips in that case.

Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9769


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


Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
(cherry picked from commit e93bffc2)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 768f17fd

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

+11 −0
Original line number Diff line number Diff line
@@ -6033,6 +6033,17 @@ static int intel_async_flip_check_uapi(struct intel_atomic_state *state, 
		return -EINVAL;

	}



	/*

	 * FIXME: Bigjoiner+async flip is busted currently.

	 * Remove this check once the issues are fixed.

	 */

	if (new_crtc_state->bigjoiner_pipes) {

		drm_dbg_kms(&i915->drm,

			    "[CRTC:%d:%s] async flip disallowed with bigjoiner\n",

			    crtc->base.base.id, crtc->base.name);

		return -EINVAL;

	}



	for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state,

					     new_plane_state, i) {

		if (plane->pipe != crtc->pipe)