From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 307FF8120A; Mon, 15 Apr 2024 14:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191495; cv=none; b=IgUQlzu8f0bJ3RrPk0daM+UMdziLnCaDB4t6fxL6/ohjEOT8l8qY46nF0m6bdayPQjJJPOVSflwDHEwEfvDvpPmwzMjWXks04VqRP0Zb9NXF/zMjyd4cz/QjC26whgCbha0L5xoXYvYJWHLfXDwMoXw3Y0NftBlnubcIQnlDPls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191495; c=relaxed/simple; bh=4QEfsxyfxiiC0q4eEZUDi2BJsQW7UcznjM9Z4FEPmNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZRvlsvM4OzihM1BLLYBLwBdoYaqp3vqchDWj1p0TFBbFBKEpluXriWKlhX9uoFAKT26tHn71MRCei6HQhfN+o0AyKGVY+sqiZZeSip+HSmJ9QGn5fgnpxWFayEVZhOBSJJ3Lp/7e7CnOCrmu8cIKCJKNSgi+4zfg0xy6XqCg3+c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HFbwEqHj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HFbwEqHj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACF1FC113CC; Mon, 15 Apr 2024 14:31:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713191495; bh=4QEfsxyfxiiC0q4eEZUDi2BJsQW7UcznjM9Z4FEPmNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFbwEqHj+Ss6bA1FHxfvbCoxvjTcYxpwQPIIjI8EmK2RPpLikebAjEjc6yn2rzGCd zHgTP9SejnM9ptAjeJVifCFon0UU2MOvsCrbsBV793FA+k0+gzV2TnkfNV3cJKhFYO OckpfSiM4g8MtW8eMlNI9iRL1I6JAxMZ1KD5b8Aw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vidya Srinivas , Vandita Kulkarni , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Rodrigo Vivi Subject: [PATCH 6.8 161/172] drm/i915: Disable port sync when bigjoiner is used Date: Mon, 15 Apr 2024 16:21:00 +0200 Message-ID: <20240415142005.246334691@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141959.976094777@linuxfoundation.org> References: <20240415141959.976094777@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä commit 0653d501409eeb9f1deb7e4c12e4d0d2c9f1cba1 upstream. The current modeset sequence can't handle port sync and bigjoiner at the same time. Refuse port sync when bigjoiner is needed, at least until we fix the modeset sequence. v2: Add a FIXME (Vandite) Cc: stable@vger.kernel.org Tested-by: Vidya Srinivas Reviewed-by: Vandita Kulkarni Link: https://patchwork.freedesktop.org/patch/msgid/20240404213441.17637-4-ville.syrjala@linux.intel.com Signed-off-by: Ville Syrjälä (cherry picked from commit b37e1347b991459c38c56ec2476087854a4f720b) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_ddi.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4229,7 +4229,12 @@ static bool m_n_equal(const struct intel static bool crtcs_port_sync_compatible(const struct intel_crtc_state *crtc_state1, const struct intel_crtc_state *crtc_state2) { + /* + * FIXME the modeset sequence is currently wrong and + * can't deal with bigjoiner + port sync at the same time. + */ return crtc_state1->hw.active && crtc_state2->hw.active && + !crtc_state1->bigjoiner_pipes && !crtc_state2->bigjoiner_pipes && crtc_state1->output_types == crtc_state2->output_types && crtc_state1->output_format == crtc_state2->output_format && crtc_state1->lane_count == crtc_state2->lane_count &&