Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp443848pxb; Thu, 9 Sep 2021 04:44:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxvOcbRTMxilNGZtnVH+wPBtpfYjIjYaih6oJ5VC1zFX6IoSD3QkfZWlicBez46nK4TpsK X-Received: by 2002:a17:906:680a:: with SMTP id k10mr2957395ejr.298.1631187840430; Thu, 09 Sep 2021 04:44:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187840; cv=none; d=google.com; s=arc-20160816; b=Nrkv4akJ5wZR157644moMfJWSBwo/avhY6mwbZs5RWaBDQuB9slQX+LmSVRM0b6ekG Pn/BD1QhBUdxmZZlR0HT5tnscd+6uDenIqEd28EBaWLNSgZukV/VbMCksL6F5y4OnfsV haTp4BHkJCPcMjgmYENilaLQaZCZf/Y5gYrbLka+iBFR2juVOU+jybdhfjxp7BbWIOwD HEnTtIJKFtFpzwuRY5VubKgmEgetG6bQjiNC3D/f6Ct3Sw5FLW2Y7fmgvE8lrDIunS+b pOr7f9BJM0YK30CqC0UD2lohWWe2p6LEhFhglxsQjjLvABmMca1xXskzpndKTc6vzHRe f7pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=B1kG/jc4E9DdkgNNCkBlOXShR/mY5nixzs9SZm1ga+Y=; b=lPEnwdk2vrV6tPt+rU0CgHtyX4dNBu3NcX3mZi8lscE9AqmIOBJKjrHmiSSnBwHv7K 6U8JmQ1Upr9anxmNgqren2/w/aREctJxBuFlsK2dnQxALGfsCpH/p0dhbou2HDv2ApZr eRp51I+wW3K5huP0euMKPn3E6spmWlmK0s6Kkq7U51rIL5AsR3FtrOQWpVh7kyqFdBP6 /c84E3fCzpijHIBPBQOC93PiuYWcJR0xXXAkrAnqFWZqfip+36YNTw0Y+meYNHCl5piV y1GcsSYkvFr+CtpYQhohc2v/lXukZc3ni9TUJ9ZDryne+Hr1hHkAQbED1KlWiHdwERPE WHtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BBUBwCFh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s2si1409397ejn.102.2021.09.09.04.43.35; Thu, 09 Sep 2021 04:44:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BBUBwCFh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235563AbhIILmS (ORCPT + 99 others); Thu, 9 Sep 2021 07:42:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:45492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235448AbhIILmR (ORCPT ); Thu, 9 Sep 2021 07:42:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C2C4661100; Thu, 9 Sep 2021 11:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187668; bh=84vvJMs9BQP/RnsgF6DIVjbTghk68ob7G2Kt8qsDxRc=; h=From:To:Cc:Subject:Date:From; b=BBUBwCFhZn2WuFf45v+A5/brjj24qbG/qRN6sLAcFoJycNGyjlAKWwJCgtIaK28xp UZulA/X66t/f2v4pb/P20LbFx2MW6aECCsX9HAqYinQzyJWYTw31ZRAKu2VbMFUged uEHbvaABmN12dNSHXeBz12v4w/xT7brdSnE9g1qMHnk3WJtEPa0xBBTPcBtm5RbWbl QBZCm9TThARbrSp8coh518z/nlxcP7esGug7T5NGWK0c4ZHpNVeKJ/dfG139/Z+opC Z4ymOgSDR9YtdIIkX+ckU8l6WYZ1QfSwFuUksV3IrQBLoydhTqz3o1nc1E6iuneFkv VvEOQp9P1a5fQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Douglas Anderson , Andrzej Hajda , Bjorn Andersson , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.14 001/252] drm/bridge: ti-sn65dsi86: Don't read EDID blob over DDC Date: Thu, 9 Sep 2021 07:36:55 -0400 Message-Id: <20210909114106.141462-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Douglas Anderson [ Upstream commit a70e558c151043ce46a5e5999f4310e0b3551f57 ] This is really just a revert of commit 58074b08c04a ("drm/bridge: ti-sn65dsi86: Read EDID blob over DDC"), resolving conflicts. The old code failed to read the EDID properly in a very important case: before the bridge's pre_enable() was called. The way things need to work: 1. Read the EDID. 2. Based on the EDID, decide on video settings and pixel clock. 3. Enable the bridge w/ the desired settings. The way things were working: 1. Try to read the EDID but fail; fall back to hardcoded values. 2. Based on hardcoded values, decide on video settings and pixel clock. 3. Enable the bridge w/ the desired settings. 4. Try again to read the EDID, it works now! 5. Realize that the hardcoded settings weren't quite right. 6. Disable / reenable the bridge w/ the right settings. The reasons for the failures were twofold: a) Since we never ran the bridge chip's pre-enable then we never set the bit to ignore HPD. This meant the bridge chip didn't even _try_ to go out on the bus and communicate with the panel. b) Even if we fixed things to ignore HPD, the EDID still wouldn't read if the panel wasn't on. Instead of reverting the code, we could fix it to set the HPD bit and also power on the panel. However, it also works nicely to just let the panel code read the EDID. Now that we've split the driver up we can expose the DDC AUX channel bus to the panel node. The panel can take charge of reading the EDID. NOTE: in order for things to work, anyone that needs to read the EDID will need to instantiate their panel using the new DP AUX bus (AKA by listing their panel under the "aux-bus" node of the bridge chip in the device tree). In the future if we want to use the bridge chip to provide a full external DP port (which won't have a panel) then we will have to conditinally add EDID reading back in. Suggested-by: Andrzej Hajda Signed-off-by: Douglas Anderson Reviewed-by: Bjorn Andersson Link: https://patchwork.freedesktop.org/patch/msgid/20210611101711.v10.9.I9330684c25f65bb318eff57f0616500f83eac3cc@changeid Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/ti-sn65dsi86.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 45a2969afb2b..aef850296756 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -124,7 +124,6 @@ * @connector: Our connector. * @host_node: Remote DSI node. * @dsi: Our MIPI DSI source. - * @edid: Detected EDID of eDP panel. * @refclk: Our reference clock. * @panel: Our panel. * @enable_gpio: The GPIO we toggle to enable the bridge. @@ -154,7 +153,6 @@ struct ti_sn65dsi86 { struct drm_dp_aux aux; struct drm_bridge bridge; struct drm_connector connector; - struct edid *edid; struct device_node *host_node; struct mipi_dsi_device *dsi; struct clk *refclk; @@ -403,24 +401,6 @@ connector_to_ti_sn65dsi86(struct drm_connector *connector) static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector) { struct ti_sn65dsi86 *pdata = connector_to_ti_sn65dsi86(connector); - struct edid *edid = pdata->edid; - int num, ret; - - if (!edid) { - pm_runtime_get_sync(pdata->dev); - edid = pdata->edid = drm_get_edid(connector, &pdata->aux.ddc); - pm_runtime_put_autosuspend(pdata->dev); - } - - if (edid && drm_edid_is_valid(edid)) { - ret = drm_connector_update_edid_property(connector, edid); - if (!ret) { - num = drm_add_edid_modes(connector, edid); - if (num) - return num; - } - } - return drm_panel_get_modes(pdata->panel, connector); } @@ -1358,8 +1338,6 @@ static void ti_sn_bridge_remove(struct auxiliary_device *adev) mipi_dsi_device_unregister(pdata->dsi); } - kfree(pdata->edid); - drm_bridge_remove(&pdata->bridge); of_node_put(pdata->host_node); -- 2.30.2