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 301041CBA18; Mon, 2 Jun 2025 14:34:40 +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=1748874880; cv=none; b=QosLaZ7HIdsHwbADzL5wFwtdJSn7Y6JDFt9ACAdWz06dXxWOu6jAnfvrYqvTjSc3EA+4VtA3WZtCXagLLHRKMsI2QDhlmL79xNOVO2l33237RQ5M+CWWLUylEqlek1ePZVT147v62+3q7SqCM6oMpQPTX0bs/o/FGufCFVhq3hU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874880; c=relaxed/simple; bh=ikDrC/21q3XZVEc1eMj27WvqblkBWCrrzPQBFVskS/g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oExRyxfDN1bLk7AShDH/zL91gAFFdaZH1F2uqiLC/Uml+ZbM/sgARhAkUYWPSyDrQY9hzqRLyFk1VNMJ7fPO6ncUspReaAUQIhJojnNGeGxriau64+QchDZ/CAnBGvdS9rbNCRnbRMU3iIuHZNuuhr5IK4EUK7ABSU5spqmS33Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hb80W/fN; 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="hb80W/fN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92B6FC4CEEB; Mon, 2 Jun 2025 14:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748874880; bh=ikDrC/21q3XZVEc1eMj27WvqblkBWCrrzPQBFVskS/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hb80W/fNxi998Qd7PuV4fl42J1hcSUmk0U6TlqDAjxP0Xf7RlF65fgU0yadH55DhS RnlZpZTLoOSZ+h0HkclPoN19WSvNiwQuJxKKyuSI3VbluhiUwo24oVfoPdXBT9UNNs lA4O9A/4JJCj1EmH60WCGWf9IBS2H7dFbEn41eIg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jessica Zhang , Maxime Ripard , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 5.4 164/204] drm: Add valid clones check Date: Mon, 2 Jun 2025 15:48:17 +0200 Message-ID: <20250602134302.103494769@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134255.449974357@linuxfoundation.org> References: <20250602134255.449974357@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jessica Zhang [ Upstream commit 41b4b11da02157c7474caf41d56baae0e941d01a ] Check that all encoders attached to a given CRTC are valid possible_clones of each other. Signed-off-by: Jessica Zhang Reviewed-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20241216-concurrent-wb-v4-3-fe220297a7f0@quicinc.com Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_atomic_helper.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 70d97a7fc6864..678dba387d838 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -561,6 +561,30 @@ mode_valid(struct drm_atomic_state *state) return 0; } +static int drm_atomic_check_valid_clones(struct drm_atomic_state *state, + struct drm_crtc *crtc) +{ + struct drm_encoder *drm_enc; + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc); + + drm_for_each_encoder_mask(drm_enc, crtc->dev, crtc_state->encoder_mask) { + if (!drm_enc->possible_clones) { + DRM_DEBUG("enc%d possible_clones is 0\n", drm_enc->base.id); + continue; + } + + if ((crtc_state->encoder_mask & drm_enc->possible_clones) != + crtc_state->encoder_mask) { + DRM_DEBUG("crtc%d failed valid clone check for mask 0x%x\n", + crtc->base.id, crtc_state->encoder_mask); + return -EINVAL; + } + } + + return 0; +} + /** * drm_atomic_helper_check_modeset - validate state object for modeset changes * @dev: DRM device @@ -724,6 +748,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, ret = drm_atomic_add_affected_planes(state, crtc); if (ret != 0) return ret; + + ret = drm_atomic_check_valid_clones(state, crtc); + if (ret != 0) + return ret; } /* -- 2.39.5