Hi Faiz,
On Mon, Feb 19, 2024 at 03:39:13PM +0530, Faiz Abbas wrote:
> Since commit f7936d6beda9 ("drm/arm/komeda: Remove component framework and
> add a simple encoder"), the devm_drm_of_get_bridge() call happens
> regardless of whether any remote nodes are available on the pipeline. Fix
> this by moving the bridge attach to its own function and calling it
> conditional on there being an output link.
>
> Fixes: f7936d6beda9 ("drm/arm/komeda: Remove component framework and add a simple encoder")
I don't know what tree you're using, but the commit that you're quoting here is
actually 4cfe5cc02e3f. I will fix it when I merge the patch.
Best regards,
Liviu
> Signed-off-by: Faiz Abbas <faiz.abbas@xxxxxxx>
> ---
> .../gpu/drm/arm/display/komeda/komeda_crtc.c | 43 ++++++++++++++-----
> 1 file changed, 32 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
> index 2c661f28410e..b645c5998230 100644
> --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
> +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
> @@ -5,6 +5,7 @@
> *
> */
> #include <linux/clk.h>
> +#include <linux/of.h>
> #include <linux/pm_runtime.h>
> #include <linux/spinlock.h>
>
> @@ -610,12 +611,34 @@ get_crtc_primary(struct komeda_kms_dev *kms, struct komeda_crtc *crtc)
> return NULL;
> }
>
> +static int komeda_attach_bridge(struct device *dev,
> + struct komeda_pipeline *pipe,
> + struct drm_encoder *encoder)
> +{
> + struct drm_bridge *bridge;
> + int err;
> +
> + bridge = devm_drm_of_get_bridge(dev, pipe->of_node,
> + KOMEDA_OF_PORT_OUTPUT, 0);
> + if (IS_ERR(bridge))
> + return dev_err_probe(dev, PTR_ERR(bridge), "remote bridge not found for pipe: %s\n",
> + of_node_full_name(pipe->of_node));
> +
> + err = drm_bridge_attach(encoder, bridge, NULL, 0);
> + if (err)
> + dev_err(dev, "bridge_attach() failed for pipe: %s\n",
> + of_node_full_name(pipe->of_node));
> +
> + return err;
> +}
> +
> static int komeda_crtc_add(struct komeda_kms_dev *kms,
> struct komeda_crtc *kcrtc)
> {
> struct drm_crtc *crtc = &kcrtc->base;
> struct drm_device *base = &kms->base;
> - struct drm_bridge *bridge;
> + struct komeda_pipeline *pipe = kcrtc->master;
> + struct drm_encoder *encoder = &kcrtc->encoder;
> int err;
>
> err = drm_crtc_init_with_planes(base, crtc,
> @@ -626,27 +649,25 @@ static int komeda_crtc_add(struct komeda_kms_dev *kms,
>
> drm_crtc_helper_add(crtc, &komeda_crtc_helper_funcs);
>
> - crtc->port = kcrtc->master->of_output_port;
> + crtc->port = pipe->of_output_port;
>
> /* Construct an encoder for each pipeline and attach it to the remote
> * bridge
> */
> kcrtc->encoder.possible_crtcs = drm_crtc_mask(crtc);
> - err = drm_simple_encoder_init(base, &kcrtc->encoder,
> - DRM_MODE_ENCODER_TMDS);
> + err = drm_simple_encoder_init(base, encoder, DRM_MODE_ENCODER_TMDS);
> if (err)
> return err;
>
> - bridge = devm_drm_of_get_bridge(base->dev, kcrtc->master->of_node,
> - KOMEDA_OF_PORT_OUTPUT, 0);
> - if (IS_ERR(bridge))
> - return PTR_ERR(bridge);
> -
> - err = drm_bridge_attach(&kcrtc->encoder, bridge, NULL, 0);
> + if (pipe->of_output_links[0]) {
> + err = komeda_attach_bridge(base->dev, pipe, encoder);
> + if (err)
> + return err;
> + }
>
> drm_crtc_enable_color_mgmt(crtc, 0, true, KOMEDA_COLOR_LUT_SIZE);
>
> - return err;
> + return 0;
> }
>
> int komeda_kms_add_crtcs(struct komeda_kms_dev *kms, struct komeda_dev *mdev)
> --
> 2.25.1
>
--
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
