drm/i915: Reject async flips with bigjoiner
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 11 Dec 2023 08:11:34 +0000 (10:11 +0200)
committerJani Nikula <jani.nikula@intel.com>
Mon, 18 Dec 2023 13:29:14 +0000 (15:29 +0200)
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231211081134.2698-1-ville.syrjala@linux.intel.com
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
(cherry picked from commit e93bffc2ac0a833b42841f31fff955549d38ce98)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c

index db7ada7907f36ef3898668c18f4409b482caa4dd..df582ff81b45fac0b9aae2c20d83dc8062300179 100644 (file)
@@ -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)