[PATCH 11/12] drm/imx: parallel-display: switch to imx_legacy_bridge / drm_bridge_connector
Dmitry Baryshkov
dmitry.baryshkov at linaro.org
Mon Mar 11 11:24:45 UTC 2024
On Mon, 11 Mar 2024 at 13:20, Dmitry Baryshkov
<dmitry.baryshkov at linaro.org> wrote:
>
> Use the imx_legacy bridge driver instead of handlign display modes via
> the connector node.
>
> All existing usecases already support attaching using
> the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag, while the imx_legacy bridge
> doesn't support creating connector at all. Switch to
> drm_bridge_connector at the same time.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
> ---
> drivers/gpu/drm/imx/ipuv3/parallel-display.c | 95 +++++-----------------------
> 1 file changed, 17 insertions(+), 78 deletions(-)
>
> diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> index 9b60bfbd16e6..73a15259c93c 100644
> --- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> +++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> @@ -12,10 +12,9 @@
> #include <linux/platform_device.h>
> #include <linux/videodev2.h>
>
> -#include <video/of_display_timing.h>
> -
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_bridge.h>
> +#include <drm/drm_bridge_connector.h>
> #include <drm/drm_managed.h>
> #include <drm/drm_of.h>
> #include <drm/drm_panel.h>
> @@ -25,7 +24,6 @@
> #include "imx-drm.h"
>
> struct imx_parallel_display_encoder {
> - struct drm_connector connector;
> struct drm_encoder encoder;
> struct drm_bridge bridge;
> struct imx_parallel_display *pd;
> @@ -34,51 +32,14 @@ struct imx_parallel_display_encoder {
> struct imx_parallel_display {
> struct device *dev;
> u32 bus_format;
> - u32 bus_flags;
> - struct drm_display_mode mode;
> struct drm_bridge *next_bridge;
> };
>
> -static inline struct imx_parallel_display *con_to_imxpd(struct drm_connector *c)
> -{
> - return container_of(c, struct imx_parallel_display_encoder, connector)->pd;
> -}
> -
> static inline struct imx_parallel_display *bridge_to_imxpd(struct drm_bridge *b)
> {
> return container_of(b, struct imx_parallel_display_encoder, bridge)->pd;
> }
>
> -static int imx_pd_connector_get_modes(struct drm_connector *connector)
> -{
> - struct imx_parallel_display *imxpd = con_to_imxpd(connector);
> - struct device_node *np = imxpd->dev->of_node;
> - int num_modes;
> -
> - if (np) {
> - struct drm_display_mode *mode = drm_mode_create(connector->dev);
> - int ret;
> -
> - if (!mode)
> - return -EINVAL;
> -
> - ret = of_get_drm_display_mode(np, &imxpd->mode,
> - &imxpd->bus_flags,
> - OF_USE_NATIVE_MODE);
> - if (ret) {
> - drm_mode_destroy(connector->dev, mode);
> - return ret;
> - }
> -
> - drm_mode_copy(mode, &imxpd->mode);
> - mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
> - drm_mode_probed_add(connector, mode);
> - num_modes++;
> - }
> -
> - return num_modes;
> -}
> -
> static const u32 imx_pd_bus_fmts[] = {
> MEDIA_BUS_FMT_RGB888_1X24,
> MEDIA_BUS_FMT_BGR888_1X24,
> @@ -172,7 +133,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,
> {
> struct imx_crtc_state *imx_crtc_state = to_imx_crtc_state(crtc_state);
> struct drm_display_info *di = &conn_state->connector->display_info;
> - struct imx_parallel_display *imxpd = bridge_to_imxpd(bridge);
> struct drm_bridge_state *next_bridge_state = NULL;
> struct drm_bridge *next_bridge;
> u32 bus_flags, bus_fmt;
> @@ -184,10 +144,8 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,
>
> if (next_bridge_state)
> bus_flags = next_bridge_state->input_bus_cfg.flags;
> - else if (di->num_bus_formats)
> - bus_flags = di->bus_flags;
> else
> - bus_flags = imxpd->bus_flags;
> + bus_flags = di->bus_flags;
>
> bus_fmt = bridge_state->input_bus_cfg.format;
> if (!imx_pd_format_supported(bus_fmt))
> @@ -203,19 +161,16 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,
> return 0;
> }
>
> -static const struct drm_connector_funcs imx_pd_connector_funcs = {
> - .fill_modes = drm_helper_probe_single_connector_modes,
> - .destroy = imx_drm_connector_destroy,
> - .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 int imx_pd_bridge_attach(struct drm_bridge *bridge,
> + enum drm_bridge_attach_flags flags)
> +{
> + struct imx_parallel_display *imxpd = bridge_to_imxpd(bridge);
>
> -static const struct drm_connector_helper_funcs imx_pd_connector_helper_funcs = {
> - .get_modes = imx_pd_connector_get_modes,
> -};
> + return drm_bridge_attach(bridge->encoder, imxpd->next_bridge, bridge, flags);
> +}
>
> static const struct drm_bridge_funcs imx_pd_bridge_funcs = {
> + .attach = imx_pd_bridge_attach,
> .atomic_reset = drm_atomic_helper_bridge_reset,
> .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
> .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> @@ -240,7 +195,6 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
> return PTR_ERR(imxpd_encoder);
>
> imxpd_encoder->pd = imxpd;
> - connector = &imxpd_encoder->connector;
> encoder = &imxpd_encoder->encoder;
> bridge = &imxpd_encoder->bridge;
>
> @@ -248,28 +202,14 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
> if (ret)
> return ret;
>
> - /* set the connector's dpms to OFF so that
> - * drm_helper_connector_dpms() won't return
> - * immediately since the current state is ON
> - * at this point.
> - */
> - connector->dpms = DRM_MODE_DPMS_OFF;
> -
> bridge->funcs = &imx_pd_bridge_funcs;
> drm_bridge_attach(encoder, bridge, NULL, 0);
This should have become DRM_BRIDGE_ATTACH_NO_CONNECTOR. I'll fix it
for v2, if the overall series is thought to be acceptable.
>
> - if (imxpd->next_bridge) {
> - ret = drm_bridge_attach(encoder, imxpd->next_bridge, bridge, 0);
> - if (ret < 0)
> - return ret;
> - } else {
> - drm_connector_helper_add(connector,
> - &imx_pd_connector_helper_funcs);
> - drm_connector_init(drm, connector, &imx_pd_connector_funcs,
> - DRM_MODE_CONNECTOR_DPI);
> -
> - drm_connector_attach_encoder(connector, encoder);
> - }
> + connector = drm_bridge_connector_init(drm, encoder);
> + if (IS_ERR(connector))
> + return PTR_ERR(connector);
> +
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> @@ -293,12 +233,11 @@ static int imx_pd_probe(struct platform_device *pdev)
>
> /* port at 1 is the output port */
> imxpd->next_bridge = devm_drm_of_get_bridge(dev, np, 1, 0);
> + if (imxpd->next_bridge == ERR_PTR(-ENODEV))
> + imxpd->next_bridge = devm_imx_drm_legacy_bridge(dev, np, DRM_MODE_CONNECTOR_DPI);
> if (IS_ERR(imxpd->next_bridge)) {
> ret = PTR_ERR(imxpd->next_bridge);
> - if (ret != -ENODEV)
> - return ret;
> -
> - imxpd->next_bridge = NULL;
> + return ret;
> }
>
> ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
>
> --
> 2.39.2
>
--
With best wishes
Dmitry
More information about the dri-devel
mailing list