Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sandor Yu <Sandor.yu@nxp.com>
To:     dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc:     andrzej.hajda@intel.com, neil.armstrong@linaro.org,
        rfoss@kernel.org, Laurent.pinchart@ideasonboard.com,
        jonas@kwiboo.se, jernej.skrabec@gmail.com,
        adrian.larumbe@collabora.com, treding@nvidia.com,
        the.cheaterman@gmail.com, l.stach@pengutronix.de,
        ville.syrjala@linux.intel.com, cychiang@chromium.org,
        Sandor.yu@nxp.com, shengjiu.wang@nxp.com
Subject: [PATCH] drm: bridge: dw_hdmi: Fix ELD is not updated issue
Date:   Wed, 26 Jul 2023 09:48:33 +0800
Message-Id: <20230726014833.1647244-1-Sandor.yu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sNqHo2FvjED9FLNyJb9fPb1L59YwmqoosNsAnXuwWltkM/Q1nTNSui+fTXi6?=
 =?us-ascii?Q?h2PsYEtmB2GCVopsqLDgg6arHCfW8doEfcbCW3RSY1I9+eMmK0Z9QBIQwI6K?=
 =?us-ascii?Q?Gg2y68u7n6qe84igdfiZt5MhlgOYkZO8vbAsjz+uPV5TNq8oNSSDbuYwTkOB?=
 =?us-ascii?Q?ErfpYAdSmoyRdHnkC0deOTP8X5gV/WvbQ0S0D5iy4gK0S1ErIHxeDtAWCYqs?=
 =?us-ascii?Q?ZTfeRqMCluz4MA56UN7BownEQ6mGGJAOV+oKg/vDoW4JB613qizkhsklSZPL?=
 =?us-ascii?Q?RbnGNN5PU31RbySxfoYdbQ2k2k+jJu+ut9Kmvs6Df06oi2/dJAkoBu5N4rYm?=
 =?us-ascii?Q?BapqLTrDf1iwc/UQARjjfq+s6WHXpEDSgLZsyAPSxkgAQhgFtv+4EIiAPFaw?=
 =?us-ascii?Q?KgDsgZM48W5hmjLIIzZ4qmNe843BCB44o+rd1oEKksHZbipG8FOucz+GpJiy?=
 =?us-ascii?Q?B9LeFzInImAaj6HZuijlGEQ53Woh0TJTrNdNluSySnf5h6GN0H7UvC0178vA?=
 =?us-ascii?Q?rBJPaS3jwyjFXzlJ70JluwHfArie3XQsPodbIfNip9myLDq5vztFsQWjIwJC?=
 =?us-ascii?Q?pOp0mB4TuxA653RCiAsFrhgWWY6XiM1w7xKpwCnoSQq1AcxzAWX/tDdbM7p5?=
 =?us-ascii?Q?VuypbadhdIYdNpnUXWhAEmwaEVhVDGDbw2BRxxMmEvfwPCspI7ZJmxcmzqc/?=
 =?us-ascii?Q?92gvHH2YBfd/8upHswvm9aw+wB+5vBeESHyMVeCiid5nbCYyX1vELusz8ROp?=
 =?us-ascii?Q?EHhzcxe/wE8lOgEksizheb2vOvqDhoWFQccwHIGviUPXxzL0JXSSv5MVxh+C?=
 =?us-ascii?Q?jUqxIDb+y1cJ0OB9Icl+0f1ysG+nxT2F13sWO6ubbDzaqUSiK+wYQzwlcq9D?=
 =?us-ascii?Q?sXNVShHll/47vVVl04B4QGwd2fs4cOws7Iv3Xc3dV968CCIuJ9A3qGzs7Odb?=
 =?us-ascii?Q?/LnEGW+wCab50BFFzKmkp1ae180rKL/mcnqMR6p86GeY+JDfV2Ds7tzMg6yq?=
 =?us-ascii?Q?mBACyz5hSgxrsO0x1RgGns3eJwqxcB7NVQTTrvvgAPZXe1TI7MN+ER5xBRRq?=
 =?us-ascii?Q?LfYJXQDZtGkafjZv1tsEYRB+npFV9R8ZyX9Fn8U2QofvwV99KDzS5Sr3+BJN?=
 =?us-ascii?Q?f24Dj3stBO8RBw3jNZfJQmjrSkM8DUzZX2mvaCgvdLkAdOQHnRtHjjqAyo7G?=
 =?us-ascii?Q?oS7xeHxyqTaVzUP1vgeZTPkI8la0/83eia8uXTjTQkJoav4MwmYRXX1wu9Vn?=
 =?us-ascii?Q?k38YOk2HALUbyjer+XgJqs5NDF4KzXkcGtM2PDFB4L5JzeETnbioydyQTiDr?=
 =?us-ascii?Q?Q3cS3hT280bU6hiReYcjalm0cp7BIzkecEzSVavPl/r7T40jNqnQ2LBvsOOV?=
 =?us-ascii?Q?hA3YJtEN5wtgpIbrumCIFX8ozHiaWNiew/nrBI/wPusuFvp6/pHXLWj242i1?=
 =?us-ascii?Q?VWdjbNQKrlcwqkaMfp7HGE54Sm64fojkPyY91Hbul1yuOPUh1fKcUlXEvvET?=
 =?us-ascii?Q?7cJYxUa/fkmHLNA7cE9eMk3nVtZNaR6kif2/JXDFDEnP69VEtSJWgsrVPi/M?=
 =?us-ascii?Q?PVwsD4PbUYvpxTQevYsHvlYjjqNl4lsPObG8ENbm?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 53e0ac55-0e35-4851-0467-08db8d7a86a0
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9448.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 01:49:18.8973
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Nw/LO8a78HmavYOH/ATEMb+CZe0qPfmZ1bsnxH4RDcTE7ZXYY8GLEPbFAZ+Mque+3/fvFaUT2PMDo573kIWwhA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7322
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The ELD (EDID-Like Data) is not updated when the HDMI cable
is plugged into different HDMI monitors.
This is because the EDID is not updated in the HDMI HPD function.
As a result, the ELD data remains unchanged and may not reflect
the capabilities of the newly connected HDMI sink device.

To address this issue, the handle_plugged_change function should move to
the bridge_atomic_enable and bridge_atomic_disable functions.
Make sure the EDID is properly updated before updating ELD.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 9a3db5234a0e0..6fa4848591226 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -196,7 +196,6 @@ struct dw_hdmi {
 
 	hdmi_codec_plugged_cb plugged_cb;
 	struct device *codec_dev;
-	enum drm_connector_status last_connector_result;
 };
 
 #define HDMI_IH_PHY_STAT0_RX_SENSE \
@@ -235,7 +234,7 @@ int dw_hdmi_set_plugged_cb(struct dw_hdmi *hdmi, hdmi_codec_plugged_cb fn,
 	mutex_lock(&hdmi->mutex);
 	hdmi->plugged_cb = fn;
 	hdmi->codec_dev = codec_dev;
-	plugged = hdmi->last_connector_result == connector_status_connected;
+	plugged = hdmi->connector.status == connector_status_connected;
 	handle_plugged_change(hdmi, plugged);
 	mutex_unlock(&hdmi->mutex);
 
@@ -2446,20 +2445,7 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi)
 
 static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi)
 {
-	enum drm_connector_status result;
-
-	result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
-
-	mutex_lock(&hdmi->mutex);
-	if (result != hdmi->last_connector_result) {
-		dev_dbg(hdmi->dev, "read_hpd result: %d", result);
-		handle_plugged_change(hdmi,
-				      result == connector_status_connected);
-		hdmi->last_connector_result = result;
-	}
-	mutex_unlock(&hdmi->mutex);
-
-	return result;
+	return hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);
 }
 
 static struct edid *dw_hdmi_get_edid(struct dw_hdmi *hdmi,
@@ -2958,6 +2944,7 @@ static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
 	hdmi->curr_conn = NULL;
 	dw_hdmi_update_power(hdmi);
 	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, false);
 	mutex_unlock(&hdmi->mutex);
 }
 
@@ -2976,6 +2963,7 @@ static void dw_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,
 	hdmi->curr_conn = connector;
 	dw_hdmi_update_power(hdmi);
 	dw_hdmi_update_phy_mask(hdmi);
+	handle_plugged_change(hdmi, true);
 	mutex_unlock(&hdmi->mutex);
 }
 
@@ -3369,7 +3357,6 @@ struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
 	hdmi->rxsense = true;
 	hdmi->phy_mask = (u8)~(HDMI_PHY_HPD | HDMI_PHY_RX_SENSE);
 	hdmi->mc_clkdis = 0x7f;
-	hdmi->last_connector_result = connector_status_disconnected;
 
 	mutex_init(&hdmi->mutex);
 	mutex_init(&hdmi->audio_mutex);
-- 
2.34.1