From: Eric Anholt <eric@anholt.net>
To: dri-devel@lists.freedesktop.org,
Archit Taneja <architt@codeaurora.org>,
Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Thierry Reding <thierry.reding@gmail.com>
Cc: linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>
Subject: [PATCH v5 3/6] drm/vc4: Delay DSI host registration until the panel has probed.
Date: Tue, 18 Jul 2017 14:05:07 -0700 [thread overview]
Message-ID: <20170718210510.12229-3-eric@anholt.net> (raw)
In-Reply-To: <20170718210510.12229-1-eric@anholt.net>
The vc4 driver was unusual in that it was delaying the panel lookup
until the attach step, while most DSI hosts will -EPROBE_DEFER until
they get a panel.
v2: Drop a debug message that slipped in.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> (v1)
---
drivers/gpu/drm/vc4/vc4_dsi.c | 38 ++++++++++++++------------------------
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index 57213f4e3c72..769f247c52a9 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -33,6 +33,7 @@
#include <drm/drm_crtc_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_mipi_dsi.h>
+#include <drm/drm_of.h>
#include <drm/drm_panel.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
@@ -504,7 +505,6 @@ struct vc4_dsi {
struct mipi_dsi_host dsi_host;
struct drm_encoder *encoder;
struct drm_bridge *bridge;
- bool is_panel_bridge;
void __iomem *regs;
@@ -1289,7 +1289,6 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
struct vc4_dsi *dsi = host_to_dsi(host);
- int ret = 0;
dsi->lanes = device->lanes;
dsi->channel = device->channel;
@@ -1324,34 +1323,12 @@ static int vc4_dsi_host_attach(struct mipi_dsi_host *host,
return 0;
}
- dsi->bridge = of_drm_find_bridge(device->dev.of_node);
- if (!dsi->bridge) {
- struct drm_panel *panel =
- of_drm_find_panel(device->dev.of_node);
-
- dsi->bridge = drm_panel_bridge_add(panel,
- DRM_MODE_CONNECTOR_DSI);
- if (IS_ERR(dsi->bridge)) {
- ret = PTR_ERR(dsi->bridge);
- dsi->bridge = NULL;
- return ret;
- }
- dsi->is_panel_bridge = true;
- }
-
return drm_bridge_attach(dsi->encoder, dsi->bridge, NULL);
}
static int vc4_dsi_host_detach(struct mipi_dsi_host *host,
struct mipi_dsi_device *device)
{
- struct vc4_dsi *dsi = host_to_dsi(host);
-
- if (dsi->is_panel_bridge) {
- drm_panel_bridge_remove(dsi->bridge);
- dsi->bridge = NULL;
- }
-
return 0;
}
@@ -1495,6 +1472,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
struct vc4_dev *vc4 = to_vc4_dev(drm);
struct vc4_dsi *dsi;
struct vc4_dsi_encoder *vc4_dsi_encoder;
+ struct drm_panel *panel;
const struct of_device_id *match;
dma_cap_mask_t dma_mask;
int ret;
@@ -1598,6 +1576,18 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
return ret;
}
+ ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
+ &panel, &dsi->bridge);
+ if (ret)
+ return ret;
+
+ if (panel) {
+ dsi->bridge = devm_drm_panel_bridge_add(dev, panel,
+ DRM_MODE_CONNECTOR_DSI);
+ if (IS_ERR(dsi->bridge))
+ return PTR_ERR(dsi->bridge);
+ }
+
/* The esc clock rate is supposed to always be 100Mhz. */
ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
if (ret) {
--
2.11.0
next prev parent reply other threads:[~2017-07-18 21:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 21:05 [PATCH v5 1/6] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math Eric Anholt
2017-07-18 21:05 ` [PATCH v5 2/6] drm/bridge: Add a devm_ allocator for panel bridge Eric Anholt
2017-07-19 8:58 ` Philippe CORNU
2017-07-26 22:43 ` Eric Anholt
2017-08-04 13:46 ` Laurent Pinchart
2017-08-04 14:57 ` Laurent Pinchart
2017-08-04 20:43 ` Eric Anholt
2017-08-04 21:25 ` Laurent Pinchart
2017-08-04 22:19 ` Ilia Mirkin
2017-08-05 10:59 ` Noralf Trønnes
2017-08-05 14:47 ` Noralf Trønnes
2017-08-07 9:25 ` Daniel Vetter
2017-08-07 10:22 ` Laurent Pinchart
2017-08-07 14:37 ` Noralf Trønnes
2017-08-07 14:59 ` Daniel Vetter
2017-08-07 21:54 ` Laurent Pinchart
2017-07-18 21:05 ` Eric Anholt [this message]
2017-08-04 9:04 ` [PATCH v5 3/6] drm/vc4: Delay DSI host registration until the panel has probed Boris Brezillon
2017-07-18 21:05 ` [PATCH v5 4/6] drm: Allow DSI devices to be registered before the host registers Eric Anholt
2017-07-19 20:31 ` Eric Anholt
2017-07-18 21:05 ` [PATCH v5 5/6] dt-bindings: Document the Raspberry Pi Touchscreen nodes Eric Anholt
2017-07-18 21:05 ` [PATCH v5 6/6] drm/panel: Add support for the Raspberry Pi 7" Touchscreen Eric Anholt
2017-08-04 8:53 ` [PATCH v5 1/6] drm/vc4: Avoid using vrefresh==0 mode in DSI htotal math Boris Brezillon
2017-08-04 21:15 ` Eric Anholt
2017-08-09 14:42 ` Boris Brezillon
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=20170718210510.12229-3-eric@anholt.net \
--to=eric@anholt.net \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=architt@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thierry.reding@gmail.com \
/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).