Hi Rob,
Thank you for the patch.
On Wed, Aug 11, 2021 at 04:52:50PM -0700, Rob Clark wrote:
From: Rob Clark robdclark@chromium.org
Slightly awkward to fish out the display_info when we aren't creating own connector. But I don't see an obvious better way.
We need a bit more than this, to support the NO_CONNECTOR case, the bridge has to implement a few extra operations, and set the bridge .ops field. I've submitted two patches to do so a while ago:
- [RFC PATCH 08/11] drm/bridge: ti-sn65dsi86: Implement bridge connector operations ([1]) - [RFC PATCH 09/11] drm/bridge: ti-sn65dsi86: Make connector creation optional ([2])
The second patch is similar to the first half of this patch, but misses the cleanup code. I'll try to rebase this and resubmit, but it may take a bit of time.
[1] https://lore.kernel.org/dri-devel/20210322030128.2283-9-laurent.pinchart+ren... [2] https://lore.kernel.org/dri-devel/20210322030128.2283-10-laurent.pinchart+re...
Signed-off-by: Rob Clark robdclark@chromium.org
drivers/gpu/drm/bridge/ti-sn65dsi86.c | 34 +++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 38dcc49eccaf..dc8112bab3d3 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -693,9 +693,11 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, return ret; }
- ret = ti_sn_bridge_connector_init(pdata);
- if (ret < 0)
goto err_conn_init;
if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {
ret = ti_sn_bridge_connector_init(pdata);if (ret < 0)goto err_conn_init;}
/*
- TODO: ideally finding host resource and dsi dev registration needs
@@ -757,7 +759,8 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, err_dsi_attach: mipi_dsi_device_unregister(dsi); err_dsi_host:
- drm_connector_cleanup(&pdata->connector);
- if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
drm_connector_cleanup(&pdata->connector);err_conn_init: drm_dp_aux_unregister(&pdata->aux); return ret; @@ -806,9 +809,30 @@ static void ti_sn_bridge_set_dsi_rate(struct ti_sn65dsi86 *pdata) regmap_write(pdata->regmap, SN_DSIA_CLK_FREQ_REG, val); }
+/*
- Find the connector and fish out the bpc from display_info. It would
- be nice if we could get this instead from drm_bridge_state, but that
- doesn't yet appear to be the case.
- */
This should be done with
struct drm_atomic_state *state = old_bridge_state->base.state; struct drm_connector *connector;
connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
static unsigned int ti_sn_bridge_get_bpp(struct ti_sn65dsi86 *pdata) {
- if (pdata->connector.display_info.bpc <= 6)
- struct drm_bridge *bridge = &pdata->bridge;
- struct drm_connector_list_iter conn_iter;
- struct drm_connector *connector;
- unsigned bpc = 0;
- drm_connector_list_iter_begin(bridge->dev, &conn_iter);
- drm_for_each_connector_iter(connector, &conn_iter) {
if (drm_connector_has_possible_encoder(connector, bridge->encoder)) {bpc = connector->display_info.bpc;break;}- }
- drm_connector_list_iter_end(&conn_iter);
- WARN_ON(bpc == 0);
- if (bpc <= 6) return 18; else return 24;