[PATCH v2 08/13] drm/bridge: lt9611: attach to the next bridge
Neil Armstrong
neil.armstrong at linaro.org
Wed Jan 11 10:56:26 UTC 2023
On 08/01/2023 17:56, Dmitry Baryshkov wrote:
> The bindings require that there is a next bridge after the lt9611. If
> nothing else it can be the hdmi-connector (as used on the RB3 platform,
> see sdm845-db845c.dts).
>
> Bring in the next bridge into the drm bridges chain and attach to it.
>
> Since lt9611 is not anymore the last bridge in the chain, this also
> allows us to drop all the !DRM_BRIDGE_ATTACH_NO_CONNECTOR functionality.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> ---
> drivers/gpu/drm/bridge/lontium-lt9611.c | 99 ++-----------------------
> 1 file changed, 7 insertions(+), 92 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c
> index 1b65a573be27..773d7a56f86f 100644
> --- a/drivers/gpu/drm/bridge/lontium-lt9611.c
> +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c
> @@ -19,6 +19,7 @@
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> #include <drm/drm_mipi_dsi.h>
> +#include <drm/drm_of.h>
> #include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
>
> @@ -33,7 +34,7 @@
> struct lt9611 {
> struct device *dev;
> struct drm_bridge bridge;
> - struct drm_connector connector;
> + struct drm_bridge *next_bridge;
>
> struct regmap *regmap;
>
> @@ -107,11 +108,6 @@ static struct lt9611 *bridge_to_lt9611(struct drm_bridge *bridge)
> return container_of(bridge, struct lt9611, bridge);
> }
>
> -static struct lt9611 *connector_to_lt9611(struct drm_connector *connector)
> -{
> - return container_of(connector, struct lt9611, connector);
> -}
> -
> static int lt9611_mipi_input_analog(struct lt9611 *lt9611)
> {
> const struct reg_sequence reg_cfg[] = {
> @@ -581,9 +577,9 @@ static struct lt9611_mode *lt9611_find_mode(const struct drm_display_mode *mode)
> return NULL;
> }
>
> -/* connector funcs */
> -static enum drm_connector_status __lt9611_detect(struct lt9611 *lt9611)
> +static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
> {
> + struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
> unsigned int reg_val = 0;
> int connected = 0;
>
> @@ -596,12 +592,6 @@ static enum drm_connector_status __lt9611_detect(struct lt9611 *lt9611)
> return lt9611->status;
> }
>
> -static enum drm_connector_status
> -lt9611_connector_detect(struct drm_connector *connector, bool force)
> -{
> - return __lt9611_detect(connector_to_lt9611(connector));
> -}
> -
> static int lt9611_read_edid(struct lt9611 *lt9611)
> {
> unsigned int temp;
> @@ -683,30 +673,6 @@ lt9611_get_edid_block(void *data, u8 *buf, unsigned int block, size_t len)
> return 0;
> }
>
> -static int lt9611_connector_get_modes(struct drm_connector *connector)
> -{
> - struct lt9611 *lt9611 = connector_to_lt9611(connector);
> - unsigned int count;
> - struct edid *edid;
> -
> - lt9611_power_on(lt9611);
> - edid = drm_do_get_edid(connector, lt9611_get_edid_block, lt9611);
> - drm_connector_update_edid_property(connector, edid);
> - count = drm_add_edid_modes(connector, edid);
> - kfree(edid);
> -
> - return count;
> -}
> -
> -static enum drm_mode_status
> -lt9611_connector_mode_valid(struct drm_connector *connector,
> - struct drm_display_mode *mode)
> -{
> - struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode);
> -
> - return lt9611_mode ? MODE_OK : MODE_BAD;
> -}
> -
> /* bridge funcs */
> static void
> lt9611_bridge_atomic_enable(struct drm_bridge *bridge,
> @@ -784,21 +750,6 @@ lt9611_bridge_atomic_disable(struct drm_bridge *bridge,
> }
> }
>
> -static struct
> -drm_connector_helper_funcs lt9611_bridge_connector_helper_funcs = {
> - .get_modes = lt9611_connector_get_modes,
> - .mode_valid = lt9611_connector_mode_valid,
> -};
> -
> -static const struct drm_connector_funcs lt9611_bridge_connector_funcs = {
> - .fill_modes = drm_helper_probe_single_connector_modes,
> - .detect = lt9611_connector_detect,
> - .destroy = drm_connector_cleanup,
> - .reset = drm_atomic_helper_connector_reset,
> - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> -};
> -
> static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,
> struct device_node *dsi_node)
> {
> @@ -834,44 +785,13 @@ static struct mipi_dsi_device *lt9611_attach_dsi(struct lt9611 *lt9611,
> return dsi;
> }
>
> -static int lt9611_connector_init(struct drm_bridge *bridge, struct lt9611 *lt9611)
> -{
> - int ret;
> -
> - ret = drm_connector_init(bridge->dev, <9611->connector,
> - <9611_bridge_connector_funcs,
> - DRM_MODE_CONNECTOR_HDMIA);
> - if (ret) {
> - DRM_ERROR("Failed to initialize connector with drm\n");
> - return ret;
> - }
> -
> - drm_connector_helper_add(<9611->connector,
> - <9611_bridge_connector_helper_funcs);
> -
> - if (!bridge->encoder) {
> - DRM_ERROR("Parent encoder object not found");
> - return -ENODEV;
> - }
> -
> - drm_connector_attach_encoder(<9611->connector, bridge->encoder);
> -
> - return 0;
> -}
> -
> static int lt9611_bridge_attach(struct drm_bridge *bridge,
> enum drm_bridge_attach_flags flags)
> {
> struct lt9611 *lt9611 = bridge_to_lt9611(bridge);
> - int ret;
> -
> - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) {
> - ret = lt9611_connector_init(bridge, lt9611);
> - if (ret < 0)
> - return ret;
> - }
>
> - return 0;
> + return drm_bridge_attach(bridge->encoder, lt9611->next_bridge,
> + bridge, flags);
> }
>
> static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge,
> @@ -918,11 +838,6 @@ lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,
> lt9611_sleep_setup(lt9611);
> }
>
> -static enum drm_connector_status lt9611_bridge_detect(struct drm_bridge *bridge)
> -{
> - return __lt9611_detect(bridge_to_lt9611(bridge));
> -}
> -
> static struct edid *lt9611_bridge_get_edid(struct drm_bridge *bridge,
> struct drm_connector *connector)
> {
> @@ -995,7 +910,7 @@ static int lt9611_parse_dt(struct device *dev,
>
> lt9611->ac_mode = of_property_read_bool(dev->of_node, "lt,ac-mode");
>
> - return 0;
> + return drm_of_find_panel_or_bridge(dev->of_node, 2, -1, NULL, <9611->next_bridge);
> }
>
> static int lt9611_gpio_init(struct lt9611 *lt9611)
Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>
More information about the dri-devel
mailing list