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 v2] drm: bridge: dw_hdmi: Fix ELD is not updated issue
Date:   Fri,  4 Aug 2023 14:11:45 +0800
Message-Id: <20230804061145.2824843-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?BWzZiDwwDQnwUT2HmXA3/pYbuM0zleAZ/FpmWhm11vxcqpjLiwAhnu94LZJC?=
 =?us-ascii?Q?dkOcoQmBwzID1ggA/whWQnj/d+PoYq3YAC7O1cZFNbaBYzLWCc9gj0qX7c8z?=
 =?us-ascii?Q?Nw/wOqszstMAtPT8Xu5AaqCJKTskf0dxjshYrzsc0PSSivd9oZnH0lYdnTrv?=
 =?us-ascii?Q?fmBUYaSXHIYhjorYXL9IpNdd8g2TxfnEjX1EFBihEEPtjEW2JyUZo22mqxGH?=
 =?us-ascii?Q?eeSvgOVLUEd/PKbockkNeKIwvQ25Tho8HZPBnCwrxL29IIGCkb1rOjHdqDVi?=
 =?us-ascii?Q?cjXS+jM38KqGrIp8iDQC63HfVPCQUUcaiJC8f3krI+YfyOIpk3eHYJjwzQOf?=
 =?us-ascii?Q?Onc9/hlNgGhGIlo5fRmQMfFNCF3U3tH0svdJ65At1b0yBRiHYqkCCuGEOovt?=
 =?us-ascii?Q?ojljmf+CFHcCPEuKzutCOnNhXSgmxrKBd1soGu8OcZOPls0iIbHIqHc2S4RZ?=
 =?us-ascii?Q?9mnQovno5qmOIdhnJc9c3dCQuEMHw6BXwtnW97e48lDJwT8OmnO6WEcucKAP?=
 =?us-ascii?Q?O1dNmyVYaJoyfGLElc9w0vZjEzt7lkTLbtygmfzQv4nyiFvd9iv9iVK6JaFj?=
 =?us-ascii?Q?h3ytwybRxugqCQ/u3JnUd5bfGaV6Vtp4HGingi3KjfJjDAqxhbVg26SDbWwK?=
 =?us-ascii?Q?x+PSpepjXiUqYXtYkjEvKJKpdeIPbgbuz8H2KvzOVpzMBw765SQrk3taRXX6?=
 =?us-ascii?Q?V8K1ncfiyQ2i+UyXKBiU1hFqcMrgc9gLkx013MlFt4DyUvg1xSTotc+W6j0Y?=
 =?us-ascii?Q?0W+mS6E5brRiE96tPYaLWgXDngHl0W5AFyLefZybjNW7dzpo6fBxU6IRd/4d?=
 =?us-ascii?Q?7evhcAbFl3osXcCVYbQohtHuM9SnnI4HAhOahG7Z7OKpMRu22qZpGIHVMT9Y?=
 =?us-ascii?Q?xfNyzaP3evacsBRVXD2Ot0BUXiPlX/DB7ion23FI8aVyIWfAq1lCEHhKNTST?=
 =?us-ascii?Q?kOn/FQAWVKDwKT3bzVJDu9SpKoi+//DwdiS3LhmqIvi0VRHlGr5q8PASSUY6?=
 =?us-ascii?Q?97HouDO4ivGr7HywCodunZ4CIE6m1WjrQqDxmp+LbL++oFWrJr5UUX3lB66f?=
 =?us-ascii?Q?1sSjI6NY/zHo/Jd0RJsGNcH6NFT12x6mlkv8JG37CPEPIXdQcvgwNqGIvMd0?=
 =?us-ascii?Q?MNBydameESHvavlS+SUShXheOXkmLSaFFPjsVQIHcZS1FvPQol0/uEAwp57x?=
 =?us-ascii?Q?+so4BRzcyRMrYB6lfQKVjbEDc7AyW11/o7r9J6OpQw98KKkTDS4qYPkOTjkZ?=
 =?us-ascii?Q?FHO4sLmmK6OAVjxK5mut6PkZrRsoIeyjhe0dFEfyi5H+5335MSP4PjGKKfSm?=
 =?us-ascii?Q?uzI7QAYpXLPVuRrjgdPVoA6OWR/FN80sDd2G7Yi21Ab0Q+PqkjezolgSXj9J?=
 =?us-ascii?Q?IpSzaspk4yIEZCEwmWuvqL2+lsDVbxVfwRmKcAzQzpAq/PxiQHBM5C9V4kSq?=
 =?us-ascii?Q?/6jwPjTpqXUyy+5ZptDnpCIs+ajScUVQabDObeDt2Zt2pZ/tjO9d5gJMzm7V?=
 =?us-ascii?Q?faqayPEZyoxKTJX5ys8eA1OvDPI4AkSd4K/AQOoorY6/OA9e8Ff+j2VG86Yx?=
 =?us-ascii?Q?TU0nS2adVhCfRyn9Izzs3yZr7zH+osOalK10vxdq?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f389d3cd-6b43-4e9a-703a-08db94b1c811
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9448.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 06:12:29.2609
 (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: 75cFUlSvfV4qUxuV8btBHScVbXa3HyHTAqcXUWv3W1yQQhzl2zPrpSbITn2A9qoi2eYYbQHJ4ZzlDyPJOZCjqQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8493
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_BLOCKED,
        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>

---
v2:
  - Add the variable of last_connector_result back to driver.
    It will only be used to initialize audio codec jack status when audio codec driver probe.

---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index aa51c61a78c7..963050de42c3 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2463,15 +2463,7 @@ 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);
+	hdmi->last_connector_result = result;
 
 	return result;
 }
@@ -2971,6 +2963,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);
 }
 
@@ -2989,6 +2982,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);
 }
 
-- 
2.34.1