devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Abhinav Kumar <quic_abhinavk@quicinc.com>
To: Rob Clark <robdclark@gmail.com>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	Sean Paul <sean@poorly.run>,
	Marijn Suijten <marijn.suijten@somainline.org>,
	David Airlie <airlied@gmail.com>,
	"Simona Vetter" <simona@ffwll.ch>,
	Stephen Boyd <swboyd@chromium.org>,
	"Chandan Uddaraju" <chandanu@codeaurora.org>,
	Guenter Roeck <groeck@chromium.org>,
	Kuogee Hsieh <quic_khsieh@quicinc.com>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konradybcio@kernel.org>,
	Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	Conor Dooley <conor+dt@kernel.org>
Cc: Vara Reddy <quic_varar@quicinc.com>,
	Rob Clark <robdclark@chromium.org>,
	Tanmay Shah <tanmay@codeaurora.org>,
	<linux-arm-msm@vger.kernel.org>,
	<dri-devel@lists.freedesktop.org>,
	<freedreno@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
	<devicetree@vger.kernel.org>,
	Jessica Zhang <quic_jesszhan@quicinc.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Abhinav Kumar <quic_abhinavk@quicinc.com>
Subject: [PATCH 34/45] drm/msm/dp: add support to re-use and clear the panel edid
Date: Thu, 5 Dec 2024 20:32:05 -0800	[thread overview]
Message-ID: <20241205-dp_mst-v1-34-f8618d42a99a@quicinc.com> (raw)
In-Reply-To: <20241205-dp_mst-v1-0-f8618d42a99a@quicinc.com>

During certain cases, the dp mst connector's panel edid can be
re-used such as getting multiple get_modes() without irq_hpd and
should be cleared in cases when the connector is destroyed or when
irq hpd is received. Add support to handle these cases for the
mst_connector's panel edid.

Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
---
 drivers/gpu/drm/msm/dp/dp_mst_drm.c | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/drivers/gpu/drm/msm/dp/dp_mst_drm.c b/drivers/gpu/drm/msm/dp/dp_mst_drm.c
index 2d92084586b466d4953429e8a6fbf766d081cb9f..15c61fd37c418889074222c0f576778adadf51c9 100644
--- a/drivers/gpu/drm/msm/dp/dp_mst_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_mst_drm.c
@@ -559,6 +559,34 @@ static struct msm_dp_mst_bridge_state *msm_dp_mst_br_priv_state(struct drm_atomi
 										&bridge->obj));
 }
 
+static void msm_dp_mst_clear_panel_edid(struct msm_dp *dp_display)
+{
+	struct msm_dp_mst *mst = dp_display->msm_dp_mst;
+	struct msm_dp_mst_connector *mst_conn;
+	struct msm_dp_panel *dp_panel;
+	struct msm_dp_mst_bridge *dp_bridge;
+	int i;
+
+	if (!dp_display) {
+		DRM_ERROR("invalid input\n");
+		return;
+	}
+
+	for (i = 0; i < mst->max_streams; i++) {
+		dp_bridge = &mst->mst_bridge[i];
+		mst_conn = to_msm_dp_mst_connector(dp_bridge->connector);
+		dp_panel = dp_bridge->msm_dp_panel;
+
+		if (!dp_panel || !mst_conn || !mst_conn->mst_port)
+			continue;
+
+		if (dp_panel->drm_edid) {
+			drm_edid_free(dp_panel->drm_edid);
+			dp_panel->drm_edid = NULL;
+		}
+	}
+}
+
 /* DP MST HPD IRQ callback */
 void msm_dp_mst_display_hpd_irq(struct msm_dp *dp_display)
 {
@@ -585,6 +613,9 @@ void msm_dp_mst_display_hpd_irq(struct msm_dp *dp_display)
 	if (handled) {
 		rc = drm_dp_dpcd_writeb(mst->dp_aux, esi_res, ack[1]);
 
+		if (ack[1] & DP_UP_REQ_MSG_RDY)
+			msm_dp_mst_clear_panel_edid(dp_display);
+
 		if (rc != 1)
 			DRM_ERROR("dpcd esi_res failed. rc=%d\n", rc);
 
@@ -620,6 +651,9 @@ static int msm_dp_mst_connector_get_modes(struct drm_connector *connector)
 	struct msm_dp_mst *mst = dp_display->msm_dp_mst;
 	struct msm_dp_panel *dp_panel = mst_conn->dp_panel;
 
+	if (dp_panel->drm_edid)
+		goto duplicate_edid;
+
 	drm_edid_free(dp_panel->drm_edid);
 
 	dp_panel->drm_edid = drm_dp_mst_edid_read(connector, &mst->mst_mgr, mst_conn->mst_port);
@@ -628,6 +662,7 @@ static int msm_dp_mst_connector_get_modes(struct drm_connector *connector)
 		return -EINVAL;
 	}
 
+duplicate_edid:
 	drm_edid_connector_update(connector, dp_panel->drm_edid);
 
 	return drm_edid_connector_add_modes(connector);
@@ -894,6 +929,10 @@ static int msm_dp_mst_connector_atomic_check(struct drm_connector *connector,
 static void dp_mst_connector_destroy(struct drm_connector *connector)
 {
 	struct msm_dp_mst_connector *mst_conn = to_msm_dp_mst_connector(connector);
+	struct msm_dp_panel *dp_panel = mst_conn->dp_panel;
+
+	drm_edid_free(dp_panel->drm_edid);
+	dp_panel->drm_edid = NULL;
 
 	drm_connector_cleanup(connector);
 	drm_dp_mst_put_port_malloc(mst_conn->mst_port);

-- 
2.34.1


  parent reply	other threads:[~2024-12-06  4:33 UTC|newest]

Thread overview: 111+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-06  4:31 [PATCH 00/45] drm/msm/dp: Add MST support for MSM chipsets Abhinav Kumar
2024-12-06  4:31 ` [PATCH 01/45] drm/msm/dp: dont call dp_catalog_ctrl_mainlink_ctrl in dp_ctrl_configure_source_params() Abhinav Kumar
2024-12-08 17:50   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 02/45] drm/msm/dp: disable the opp table request even for dp_ctrl_off_link() Abhinav Kumar
2024-12-06  8:38   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 03/45] drm/msm/dp: fix the intf_type of MST interfaces Abhinav Kumar
2024-12-06  8:41   ` Dmitry Baryshkov
2025-01-07  0:55   ` Bjorn Andersson
2025-05-29 10:06     ` Yongxing Mou
2024-12-06  4:31 ` [PATCH 04/45] drm/msm/dp: split msm_dp_panel_read_sink_caps() into two parts Abhinav Kumar
2024-12-06  8:51   ` Dmitry Baryshkov
2025-05-22  9:51     ` Yongxing Mou
2025-05-22 12:38       ` Dmitry Baryshkov
2025-05-26 12:21         ` Yongxing Mou
2024-12-06  4:31 ` [PATCH 05/45] drm/msm/dp: add a helper to read mst caps for dp_panel Abhinav Kumar
2024-12-06  8:52   ` Dmitry Baryshkov
2025-05-26 12:26     ` Yongxing Mou
2025-05-28 16:13       ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 06/45] drm/msm/dp: remove dp_display's dp_mode and use dp_panel's instead Abhinav Kumar
2024-12-06  9:01   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 07/45] drm/msm/dp: break up dp_display_enable into two parts Abhinav Kumar
2024-12-06  9:04   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 08/45] drm/msm/dp: re-arrange dp_display_disable() into functional parts Abhinav Kumar
2024-12-08 12:03   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 09/45] drm/msm/dp: allow dp_ctrl stream APIs to use any panel passed to it Abhinav Kumar
2024-12-06  9:09   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 10/45] drm/msm/dp: move the pixel clock control to its own API Abhinav Kumar
2024-12-06  9:11   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 11/45] drm/msm/dp: split dp_ctrl_off() into stream and link parts Abhinav Kumar
2024-12-06  9:14   ` Dmitry Baryshkov
2025-05-26 12:47     ` Yongxing Mou
2025-05-28 16:15       ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 12/45] drm/msm/dp: make bridge helpers use dp_display to allow re-use Abhinav Kumar
2024-12-08 11:07   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 13/45] drm/msm/dp: separate dp_display_prepare() into its own API Abhinav Kumar
2024-12-06 12:12   ` Stephan Gerhold
2024-12-06  4:31 ` [PATCH 14/45] drm/msm/dp: introduce stream_id for each DP panel Abhinav Kumar
2024-12-08 11:22   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 15/45] drm/msm/dp: convert dp_display_set_mode() to use dp_panel argument Abhinav Kumar
2024-12-08 11:39   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 16/45] drm/msm/dp: add support for programming p1 register block Abhinav Kumar
2024-12-06  9:39   ` Dmitry Baryshkov
2024-12-06  9:42   ` Dmitry Baryshkov
2024-12-08  6:22   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 17/45] drm/msm/dp: use stream_id to change offsets in dp_catalog Abhinav Kumar
2024-12-08  5:42   ` Dmitry Baryshkov
2025-05-26 12:57     ` Yongxing Mou
2025-05-28 16:17       ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 18/45] drm/msm/dp: add support to send ACT packets for MST Abhinav Kumar
2024-12-08  5:45   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 19/45] drm/msm/dp: add support to program mst support in mainlink Abhinav Kumar
2024-12-08 11:42   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 20/45] drm/msm/dp: no need to update tu calculation for mst Abhinav Kumar
2024-12-08  5:45   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 21/45] drm/msm/dp: add support for mst channel slot allocation Abhinav Kumar
2024-12-08  6:13   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 22/45] drm/msm/dp: add support to send vcpf packets in dp controller Abhinav Kumar
2024-12-08  6:20   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 23/45] drm/msm/dp: always program MST_FIFO_CONSTANT_FILL for MST Abhinav Kumar
2024-12-08 11:44   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 24/45] drm/msm/dp: abstract out the dp_display stream helpers to accept a panel Abhinav Kumar
2024-12-08 11:46   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 25/45] drm/msm/dp: move link related operations to dp_display_unprepare() Abhinav Kumar
2024-12-08 11:48   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 26/45] drm/msm/dp: replace power_on with active_stream_cnt for dp_display Abhinav Kumar
2024-12-08 11:50   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 27/45] drm/msm/dp: make the SST bridge disconnected when mst is active Abhinav Kumar
2024-12-08 11:51   ` Dmitry Baryshkov
2024-12-06  4:31 ` [PATCH 28/45] drm/msm/dp: add an API to initialize MST on sink side Abhinav Kumar
2024-12-08 11:56   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 29/45] drm/msm/dp: skip reading the EDID for MST cases Abhinav Kumar
2024-12-06  9:32   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 30/45] drm/msm/dp: add dp_display_get_panel() to initialize DP panel Abhinav Kumar
2024-12-08  8:51   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 31/45] drm/msm/dp: add dp_mst_drm to manage DP MST bridge operations Abhinav Kumar
2024-12-06 10:12   ` Dmitry Baryshkov
2025-05-27 10:29     ` Yongxing Mou
2025-05-28 18:02       ` Dmitry Baryshkov
2024-12-08  7:19   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 32/45] drm/msm/dp: add connector abstraction for DP MST Abhinav Kumar
2024-12-08  7:24   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 33/45] drm/msm/dp: add irq hpd callback for dp mst Abhinav Kumar
2024-12-08  6:44   ` Dmitry Baryshkov
2024-12-06  4:32 ` Abhinav Kumar [this message]
2024-12-08  8:53   ` [PATCH 34/45] drm/msm/dp: add support to re-use and clear the panel edid Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 35/45] drm/msm/dp: add a mst session mutex to protect bridge ops Abhinav Kumar
2024-12-08  8:54   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 36/45] drm/msm/dp: propagate hpd state changes to dp mst module Abhinav Kumar
2024-12-08  8:58   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 37/45] drm/msm: add support for non-blocking commits Abhinav Kumar
2024-12-06  9:27   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 38/45] drm/msm: initialize DRM MST encoders for DP controllers Abhinav Kumar
2024-12-08  6:25   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 39/45] drm/msm/dp: initialize dp_mst module for each DP MST controller Abhinav Kumar
2024-12-08  6:31   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 40/45] drm/msm: add a stream to intf map for DP controller Abhinav Kumar
2024-12-06  9:20   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 41/45] drm/msm/dpu: use msm_dp_get_mst_intf_id() to get the intf id Abhinav Kumar
2024-12-06  9:25   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 42/45] drm/msm/dp: mark ST_DISCONNECTED only if all streams are disabled Abhinav Kumar
2024-12-08 11:58   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 43/45] drm/msm/dp: populate the max_streams for sa8775 mst controller Abhinav Kumar
2024-12-08 12:00   ` Dmitry Baryshkov
2024-12-06  4:32 ` [PATCH 44/45] arm64: dts: qcom: add mst support for pixel stream clk for DP0 Abhinav Kumar
2024-12-06 12:20   ` Konrad Dybcio
2025-01-07  0:52   ` Bjorn Andersson
2024-12-06  4:32 ` [PATCH 45/45] arm64: dts: qcom: add mst support for pixel 1 stream clk for DP1 Abhinav Kumar
2025-01-07  1:06 ` [PATCH 00/45] drm/msm/dp: Add MST support for MSM chipsets Bjorn Andersson
2025-01-07  1:10   ` Abhinav Kumar
2025-05-10 12:12 ` Jens Glathe
2025-05-22 18:19   ` Abhinav Kumar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241205-dp_mst-v1-34-f8618d42a99a@quicinc.com \
    --to=quic_abhinavk@quicinc.com \
    --cc=airlied@gmail.com \
    --cc=andersson@kernel.org \
    --cc=chandanu@codeaurora.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=groeck@chromium.org \
    --cc=konradybcio@kernel.org \
    --cc=krzk+dt@kernel.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marijn.suijten@somainline.org \
    --cc=quic_jesszhan@quicinc.com \
    --cc=quic_khsieh@quicinc.com \
    --cc=quic_varar@quicinc.com \
    --cc=robdclark@chromium.org \
    --cc=robdclark@gmail.com \
    --cc=robh@kernel.org \
    --cc=sean@poorly.run \
    --cc=simona@ffwll.ch \
    --cc=swboyd@chromium.org \
    --cc=tanmay@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).