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 00094396EA5; Mon, 5 May 2025 23:06:22 +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=1746486384; cv=none; b=AAgVBI0xtr1K4qAmLhOyWQAL6fxHmKw/27hc2qNDLn01N03ohL7WmWVn5/eMokNYzU0h62dyUFjDDqc5PFv2FdIK5g1mrXxVut+FCjnqzH22/qTrYhw6cM03GeUmNyjjufT33uMz07r9ki5U5wYUz9OX2GRZHMwgrakGjaQH2q4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486384; c=relaxed/simple; bh=osrs3CyFZ2f+ksNPpjlzidOtyNYYoswmnpUkwfOmRGQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XJQSzLIns+PKoo3+hOqo1MNSvPVBnL1xXYwtPgOK7mvl8q4ddlPrOzAhLA83v1j2WkLoPYpXDPRKn/JoT+ws+0IbsZU5Vk8q0fDbSPiFYadvMsJ/TrlYcJO0Us7GolmFn10r9CtLqpedcWmVaVmtJocbZdDyhnaShcqMzPMDtc8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UorKPqXM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UorKPqXM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0373C4CEF1; Mon, 5 May 2025 23:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486382; bh=osrs3CyFZ2f+ksNPpjlzidOtyNYYoswmnpUkwfOmRGQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UorKPqXMZbrvuqz7thL31WD4l35mAH6KBCk0FTkCueL+dqGwIkfmWZRUx/HovTebv B264HsnZ2kHn7ZirLyoeLJu9vjHNNkRLxvyB8izM48XRxUPNQ5NTVyvirM8q1wMkAc WXDQSI5YCz1ZQhWkC58wNIMt0/FV+e9uPKca8qMbOyKNdOzh+AGEA0FQHlGzXwXH/w GKbgOSdD5ZaM7zXPg8KDmSlPiPv15lVZIx8SoMcFlXB4kN6d2rv9E8Z55LOlfGpuBg tthmZN7kQwPdGtAC6XoV36QIQC88aZT/cr0H7PBo60ANPOjeO+OHF00o6NK/v4Fx2+ /G4HGSD/eJRmQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jessica Zhang , Maxime Ripard , Dmitry Baryshkov , Sasha Levin , maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 294/294] drm: Add valid clones check Date: Mon, 5 May 2025 18:56:34 -0400 Message-Id: <20250505225634.2688578-294-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit 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 f3681970887cc..1aa59586c8f81 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -573,6 +573,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 @@ -744,6 +768,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