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 <rodrigo.vivi@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20251216130351.2799110-1-jouni.hogander@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9c6d3ecdb589e08be617f3fb602e6cb33369a9a3..d5947cc9b94c550858baebc2b58d6c0f01108e8c 100644 (file)
--- 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)