From: Jouni Högander Date: Tue, 16 Dec 2025 13:03:51 +0000 (+0200) Subject: drm/i915/display: Allow async flip when Selective Fetch is enabled X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d400dad620ab146303ba0d5ffd1b3c6639cc4fa1;p=thirdparty%2Fkernel%2Flinux.git drm/i915/display: Allow async flip when Selective Fetch is enabled Fix silent conflict during drm-next backmerge causing async flips being rejected when Selective Fetch is enabled. Fixes: b8304863a399 ("Merge drm/drm-next into drm-intel-next") Cc: Rodrigo Vivi Signed-off-by: Jouni Högander Acked-by: Jani Nikula Link: https://patch.msgid.link/20251216130351.2799110-1-jouni.hogander@intel.com Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 9c6d3ecdb589e..d5947cc9b94c5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -6026,14 +6026,6 @@ static int intel_async_flip_check_uapi(struct intel_atomic_state *state, return -EINVAL; } - /* FIXME: selective fetch should be disabled for async flips */ - if (new_crtc_state->enable_psr2_sel_fetch) { - drm_dbg_kms(display->drm, - "[CRTC:%d:%s] async flip disallowed with PSR2 selective fetch\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)